From 1191951e0868770cc2424535ac659485dae98984 Mon Sep 17 00:00:00 2001
From: hwspeedy <ns@bigbear.dk>
Date: Thu, 25 Apr 2024 19:38:44 +0200
Subject: FIX Added more themes, fixed menu icons

---
 includes/callbacks.h |  2 ++
 includes/uidefs.h    | 24 ++++++++----------------
 2 files changed, 10 insertions(+), 16 deletions(-)

(limited to 'includes')

diff --git a/includes/callbacks.h b/includes/callbacks.h
index 4ecfa58c..65886704 100644
--- a/includes/callbacks.h
+++ b/includes/callbacks.h
@@ -46,5 +46,7 @@ void cb_theme1();
 void cb_theme2();
 void cb_theme3();
 void cb_theme4();
+void cb_theme5();
+void cb_theme6();
 
 #endif	/* __CALLBACKS_H__ */
diff --git a/includes/uidefs.h b/includes/uidefs.h
index d8b12143..2165ea8c 100644
--- a/includes/uidefs.h
+++ b/includes/uidefs.h
@@ -3,28 +3,19 @@
 
 #include "config.h"
 
-#if RELEASE
-#define DEBUG_TOOLBAR_ITEMS
-#else /* !RELEASE */
-#define DEBUG_TOOLBAR_ITEMS                                                    \
-    "<separator/>"                                                             \
-    "<toolitem name=\"ReportBug\" action=\"ReportBugAction\" />"
-#endif /* !RELEASE */
-
 #define SYNC_MANAGER_MENU_ITEMS                                                \
     "<separator/>"                                                             \
-    "<menuitem name=\"SyncManager\" action=\"SyncManagerAction\" "             \
-    "always-show-image=\"true\"/>"                                             \
+    "<menuitem name=\"SyncManager\" action=\"SyncManagerAction\" always-show-image=\"true\"/>"           \
     "<menuitem name=\"SyncOnStartup\" action=\"SyncOnStartupAction\"/>"
 #define SYNC_MANAGER_TOOL_ITEMS                                                \
-    "<toolitem name=\"SyncManager\" action=\"SyncManagerAction\"/>"
+    "<toolitem name=\"SyncManager\" action=\"SyncManagerAction\" always-show-image=\"true\"/>"
 
 char *uidefs_str =
     "<ui>"
     "	<menubar>"
     "	<menu name=\"InformationMenu\" action=\"InformationMenuAction\">"
-    "		<menuitem name=\"Report\" action=\"ReportAction\" />"
-    "		<menuitem name=\"Copy\" action=\"CopyAction\" />"
+    "		<menuitem name=\"Report\" action=\"ReportAction\" always-show-image=\"true\"/>"
+    "		<menuitem name=\"Copy\" action=\"CopyAction\" always-show-image=\"true\"/>"
     SYNC_MANAGER_MENU_ITEMS \
     "		<separator/>"
     "		<menuitem name=\"Quit\" action=\"QuitAction\" />"
@@ -38,14 +29,16 @@ char *uidefs_str =
     "            <menuitem name=\"Theme2\" action=\"Theme2Action\"/>"
     "            <menuitem name=\"Theme3\" action=\"Theme3Action\"/>"
     "            <menuitem name=\"Theme4\" action=\"Theme4Action\"/>"
+    "            <menuitem name=\"Theme5\" action=\"Theme5Action\"/>"
+    "            <menuitem name=\"Theme6\" action=\"Theme6Action\"/>"
     "	   </menu>"
     "		<separator/>"
     "		<separator name=\"LastSep\"/>"
     "		<menuitem name=\"Refresh\" action=\"RefreshAction\"/>"
     "	</menu>"
     "	<menu name=\"HelpMenu\" action=\"HelpMenuAction\">"
-    "		<menuitem name=\"WebPage\" action=\"HomePageAction\"/>"
-    "		<menuitem name=\"ReportBug\" action=\"ReportBugAction\"/>"
+    "		<menuitem name=\"WebPage\" action=\"HomePageAction\" always-show-image=\"true\"/>"
+    "		<menuitem name=\"ReportBug\" action=\"ReportBugAction\" always-show-image=\"true\"/>"
     "		<menuitem name=\"About\" action=\"AboutAction\"/>"
     "	</menu>"
     "	</menubar>"
@@ -56,7 +49,6 @@ char *uidefs_str =
     "			<toolitem name=\"Report\" action=\"ReportAction\"/>"
     "			<toolitem name=\"Copy\" action=\"CopyAction\"/>"
     "			<separator/>"
-    DEBUG_TOOLBAR_ITEMS \
     SYNC_MANAGER_TOOL_ITEMS \
     "		</placeholder>"
     "	</toolbar>"
-- 
cgit v1.2.3