From 5f01c706267c595de92406a32e7f31ef5056c2d0 Mon Sep 17 00:00:00 2001
From: Lucas de Castro Borges <lucas@gnuabordo.com.br>
Date: Mon, 22 Apr 2024 00:35:53 -0300
Subject: New upstream version 2.0.3pre

---
 includes/uidefs.h | 103 +++++++++++++++++++++++++++++-------------------------
 1 file changed, 55 insertions(+), 48 deletions(-)

(limited to 'includes/uidefs.h')

diff --git a/includes/uidefs.h b/includes/uidefs.h
index 70d2de17..c3042492 100644
--- a/includes/uidefs.h
+++ b/includes/uidefs.h
@@ -5,55 +5,62 @@
 
 #if RELEASE
 #define DEBUG_TOOLBAR_ITEMS
-#else 		/* !RELEASE */
-#define DEBUG_TOOLBAR_ITEMS	"<separator/>" \
-                                "<toolitem name=\"ReportBug\" action=\"ReportBugAction\" />"
-#endif		/* !RELEASE */
+#else /* !RELEASE */
+#define DEBUG_TOOLBAR_ITEMS                                                    \
+    "<separator/>"                                                             \
+    "<toolitem name=\"ReportBug\" action=\"ReportBugAction\" />"
+#endif /* !RELEASE */
 
-#ifdef HAS_LIBSOUP
-#define SYNC_MANAGER_ITEMS "		<separator/>" \
-"		<menuitem name=\"SyncManager\" action=\"SyncManagerAction\" />"
+#define SYNC_MANAGER_MENU_ITEMS                                                \
+    "<separator/>"                                                             \
+    "<menuitem name=\"SyncManager\" action=\"SyncManagerAction\" "             \
+    "always-show-image=\"true\"/>"                                             \
+    "<menuitem name=\"SyncOnStartup\" action=\"SyncOnStartupAction\"/>"
+#define SYNC_MANAGER_TOOL_ITEMS                                                \
+    "<toolitem name=\"SyncManager\" action=\"SyncManagerAction\"/>"
 
-#else		/* !HAS_LIBSOUP */
-#define SYNC_MANAGER_ITEMS
-#endif		/* !HAS_LIBSOUP */
+char *uidefs_str =
+    "<ui>"
+    "	<menubar>"
+    "	<menu name=\"InformationMenu\" action=\"InformationMenuAction\">"
+    "		<menuitem name=\"Report\" action=\"ReportAction\" />"
+    "		<menuitem name=\"Copy\" action=\"CopyAction\" />"
+    SYNC_MANAGER_MENU_ITEMS \
+    "		<separator/>"
+    "		<menuitem name=\"Quit\" action=\"QuitAction\" />"
+    "	</menu>"
+    "	<menu name=\"ViewMenu\" action=\"ViewMenuAction\">"
+    "		<menuitem name=\"SidePane\" action=\"SidePaneAction\"/>"
+    "		<menuitem name=\"Toolbar\" action=\"ToolbarAction\"/>"
+    "		<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=\"About\" action=\"AboutAction\"/>"
+    "	</menu>"
+    "	</menubar>"
+    "	<toolbar action=\"MainMenuBar\" action=\"MainMenuBarAction\">"
+    "		<placeholder name=\"ToolItems\">"
+    "			<toolitem name=\"Refresh\" action=\"RefreshAction\"/>"
+    "			<separator/>"
+    "			<toolitem name=\"Report\" action=\"ReportAction\"/>"
+    "			<toolitem name=\"Copy\" action=\"CopyAction\"/>"
+    "			<separator/>"
+    DEBUG_TOOLBAR_ITEMS \
+    SYNC_MANAGER_TOOL_ITEMS \
+    "		</placeholder>"
+    "	</toolbar>"
+    "</ui>";
 
-char *uidefs_str = "<ui>" \
-"	<menubar>" \
-"	<menu name=\"InformationMenu\" action=\"InformationMenuAction\">" \
-"		<menuitem name=\"Report\" action=\"ReportAction\" />" \
-"		<menuitem name=\"Copy\" action=\"CopyAction\" />" \
-SYNC_MANAGER_ITEMS
-"		<separator/>" \
-"		<menuitem name=\"Quit\" action=\"QuitAction\" />" \
-"	</menu>" \
-"	<menu name=\"ViewMenu\" action=\"ViewMenuAction\">" \
-"		<menuitem name=\"SidePane\" action=\"SidePaneAction\"/>" \
-"		<menuitem name=\"Toolbar\" action=\"ToolbarAction\"/>" \
-"		<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\"/>" \
-"		<separator/>" \
-"		<menu name=\"HelpMenuModules\" action=\"HelpMenuModulesAction\">" \
-"			<separator name=\"LastSep\"/>" \
-"		</menu>" \
-"		<menuitem name=\"About\" action=\"AboutAction\"/>" \
-"	</menu>" \
-"	</menubar>" \
-"	<toolbar action=\"MainMenuBar\" action=\"MainMenuBarAction\">" \
-"		<placeholder name=\"ToolItems\">" \
-"			<toolitem name=\"Refresh\" action=\"RefreshAction\"/>" \
-"			<separator/>" \
-"			<toolitem name=\"Report\" action=\"ReportAction\"/>" \
-"			<toolitem name=\"Copy\" action=\"CopyAction\"/>" \
-"			<separator/>" \
-DEBUG_TOOLBAR_ITEMS \
-"		</placeholder>" \
-"	</toolbar>" \
-"</ui>";
+/*DISABLED
+    "		<separator/>"
+    "		<menu name=\"HelpMenuModules\" "
+    "action=\"HelpMenuModulesAction\">"
+    "			<separator name=\"LastSep\"/>"
+    "		</menu>"
+*/
 
-#endif	/* __UIDEFS_H__ */
+#endif /* __UIDEFS_H__ */
-- 
cgit v1.2.3