aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--includes/callbacks.h2
-rw-r--r--includes/uidefs.h24
-rwxr-xr-xpixmaps/bg5_dark.jpgbin0 -> 254501 bytes
-rwxr-xr-xpixmaps/bg5_light.jpgbin0 -> 282249 bytes
-rwxr-xr-xpixmaps/bg6_dark.jpgbin0 -> 167496 bytes
-rwxr-xr-xpixmaps/bg6_light.jpgbin0 -> 167532 bytes
-rw-r--r--shell/callbacks.c36
-rw-r--r--shell/menu.c8
-rw-r--r--shell/shell.c6
9 files changed, 59 insertions, 17 deletions
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>"
diff --git a/pixmaps/bg5_dark.jpg b/pixmaps/bg5_dark.jpg
new file mode 100755
index 00000000..6023c0de
--- /dev/null
+++ b/pixmaps/bg5_dark.jpg
Binary files differ
diff --git a/pixmaps/bg5_light.jpg b/pixmaps/bg5_light.jpg
new file mode 100755
index 00000000..5cc4f266
--- /dev/null
+++ b/pixmaps/bg5_light.jpg
Binary files differ
diff --git a/pixmaps/bg6_dark.jpg b/pixmaps/bg6_dark.jpg
new file mode 100755
index 00000000..cbdba6d9
--- /dev/null
+++ b/pixmaps/bg6_dark.jpg
Binary files differ
diff --git a/pixmaps/bg6_light.jpg b/pixmaps/bg6_light.jpg
new file mode 100755
index 00000000..b9ed47f4
--- /dev/null
+++ b/pixmaps/bg6_light.jpg
Binary files differ
diff --git a/shell/callbacks.c b/shell/callbacks.c
index e6482c4f..1d151b9c 100644
--- a/shell/callbacks.c
+++ b/shell/callbacks.c
@@ -70,6 +70,8 @@ void cb_theme1()
if(shell_action_get_active("Theme2Action")) shell_action_set_active("Theme2Action",FALSE);
if(shell_action_get_active("Theme3Action")) shell_action_set_active("Theme3Action",FALSE);
if(shell_action_get_active("Theme4Action")) shell_action_set_active("Theme4Action",FALSE);
+ if(shell_action_get_active("Theme5Action")) shell_action_set_active("Theme5Action",FALSE);
+ if(shell_action_get_active("Theme6Action")) shell_action_set_active("Theme6Action",FALSE);
}
cb_disable_theme();
}
@@ -81,6 +83,8 @@ void cb_theme2()
if(shell_action_get_active("Theme1Action")) shell_action_set_active("Theme1Action",FALSE);
if(shell_action_get_active("Theme3Action")) shell_action_set_active("Theme3Action",FALSE);
if(shell_action_get_active("Theme4Action")) shell_action_set_active("Theme4Action",FALSE);
+ if(shell_action_get_active("Theme5Action")) shell_action_set_active("Theme5Action",FALSE);
+ if(shell_action_get_active("Theme6Action")) shell_action_set_active("Theme6Action",FALSE);
}
cb_disable_theme();
}
@@ -92,6 +96,8 @@ void cb_theme3()
if(shell_action_get_active("Theme1Action")) shell_action_set_active("Theme1Action",FALSE);
if(shell_action_get_active("Theme2Action")) shell_action_set_active("Theme2Action",FALSE);
if(shell_action_get_active("Theme4Action")) shell_action_set_active("Theme4Action",FALSE);
+ if(shell_action_get_active("Theme5Action")) shell_action_set_active("Theme5Action",FALSE);
+ if(shell_action_get_active("Theme6Action")) shell_action_set_active("Theme6Action",FALSE);
}
cb_disable_theme();
}
@@ -103,6 +109,34 @@ void cb_theme4()
if(shell_action_get_active("Theme1Action")) shell_action_set_active("Theme1Action",FALSE);
if(shell_action_get_active("Theme2Action")) shell_action_set_active("Theme2Action",FALSE);
if(shell_action_get_active("Theme3Action")) shell_action_set_active("Theme3Action",FALSE);
+ if(shell_action_get_active("Theme5Action")) shell_action_set_active("Theme5Action",FALSE);
+ if(shell_action_get_active("Theme6Action")) shell_action_set_active("Theme6Action",FALSE);
+ }
+ cb_disable_theme();
+}
+void cb_theme5()
+{
+ if(shell_action_get_active("Theme5Action")){
+ params.theme=5;
+ if(shell_action_get_active("DisableThemeAction")) shell_action_set_active("DisableThemeAction",FALSE);
+ if(shell_action_get_active("Theme1Action")) shell_action_set_active("Theme1Action",FALSE);
+ if(shell_action_get_active("Theme2Action")) shell_action_set_active("Theme2Action",FALSE);
+ if(shell_action_get_active("Theme3Action")) shell_action_set_active("Theme3Action",FALSE);
+ if(shell_action_get_active("Theme4Action")) shell_action_set_active("Theme4Action",FALSE);
+ if(shell_action_get_active("Theme6Action")) shell_action_set_active("Theme6Action",FALSE);
+ }
+ cb_disable_theme();
+}
+void cb_theme6()
+{
+ if(shell_action_get_active("Theme6Action")){
+ params.theme=6;
+ if(shell_action_get_active("DisableThemeAction")) shell_action_set_active("DisableThemeAction",FALSE);
+ if(shell_action_get_active("Theme1Action")) shell_action_set_active("Theme1Action",FALSE);
+ if(shell_action_get_active("Theme2Action")) shell_action_set_active("Theme2Action",FALSE);
+ if(shell_action_get_active("Theme3Action")) shell_action_set_active("Theme3Action",FALSE);
+ if(shell_action_get_active("Theme4Action")) shell_action_set_active("Theme4Action",FALSE);
+ if(shell_action_get_active("Theme5Action")) shell_action_set_active("Theme5Action",FALSE);
}
cb_disable_theme();
}
@@ -128,6 +162,8 @@ void cb_disable_theme()
if(shell_action_get_active("Theme2Action")) shell_action_set_active("Theme2Action",FALSE);
if(shell_action_get_active("Theme3Action")) shell_action_set_active("Theme3Action",FALSE);
if(shell_action_get_active("Theme4Action")) shell_action_set_active("Theme4Action",FALSE);
+ if(shell_action_get_active("Theme5Action")) shell_action_set_active("Theme5Action",FALSE);
+ if(shell_action_get_active("Theme6Action")) shell_action_set_active("Theme6Action",FALSE);
}
g_mkdir(g_get_user_config_dir(),0755);
diff --git a/shell/menu.c b/shell/menu.c
index 2d5e0874..72d5ab42 100644
--- a/shell/menu.c
+++ b/shell/menu.c
@@ -128,6 +128,14 @@ static GtkToggleActionEntry toggle_entries[] = {
N_("Theme Tux Star"), NULL,
NULL,
G_CALLBACK(cb_theme4)},
+ {"Theme5Action", NULL,
+ N_("Theme Retro PC"), NULL,
+ NULL,
+ G_CALLBACK(cb_theme5)},
+ {"Theme6Action", NULL,
+ N_("Theme Silicon Crypto"), NULL,
+ NULL,
+ G_CALLBACK(cb_theme6)},
#endif
};
diff --git a/shell/shell.c b/shell/shell.c
index f3225783..f7572307 100644
--- a/shell/shell.c
+++ b/shell/shell.c
@@ -514,7 +514,7 @@ static void create_window(void)
params.theme = g_key_file_get_integer(key_file, "Theme", "ThemeNumber", NULL);
if(params.theme==0) params.theme=1;
if(params.theme<-1) params.theme=-1;
- if(params.theme>4) params.theme=-1;
+ if(params.theme>6) params.theme=-1;
g_free(conf_path);
g_key_file_free(key_file);
@@ -523,6 +523,8 @@ static void create_window(void)
if(params.theme==2) shell_action_set_active("Theme2Action", TRUE);
if(params.theme==3) shell_action_set_active("Theme3Action", TRUE);
if(params.theme==4) shell_action_set_active("Theme4Action", TRUE);
+ if(params.theme==5) shell_action_set_active("Theme5Action", TRUE);
+ if(params.theme==6) shell_action_set_active("Theme6Action", TRUE);
#if GTK_CHECK_VERSION(3, 0, 0)
if(params.theme>0){
@@ -784,6 +786,8 @@ void shell_init(GSList * modules)
shell_action_set_property("Theme2Action", "draw-as-radio", TRUE);
shell_action_set_property("Theme3Action", "draw-as-radio", TRUE);
shell_action_set_property("Theme4Action", "draw-as-radio", TRUE);
+ shell_action_set_property("Theme5Action", "draw-as-radio", TRUE);
+ shell_action_set_property("Theme6Action", "draw-as-radio", TRUE);
shell->tree = tree_new();
shell->info_tree = info_tree_new();
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-05 18:08:56 +0000