all repos — tint2 @ aa9e1afdf20cc17caa325f35cba909809a4eab65

fork of the tint2 desktop panel for my custom setup - only minimized windows across all desktops for the taskbar

tint2conf: GUI changes

git-svn-id: http://tint2.googlecode.com/svn/trunk@764 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
o9000 o9000
commit

aa9e1afdf20cc17caa325f35cba909809a4eab65

parent

167bb31084cc05cf5eae0926d6f7cfa3240ce8ad

2 files changed, 112 insertions(+), 178 deletions(-)

jump to
M src/tint2conf/main.csrc/tint2conf/main.c

@@ -39,7 +39,7 @@ GtkWidget *g_window;

static GtkUIManager *globalUIManager = NULL; -static void menuAddWidget (GtkUIManager *, GtkWidget *, GtkContainer *); +static void menuAddWidget(GtkUIManager *, GtkWidget *, GtkContainer *); // action on menus static void menuAdd();

@@ -49,11 +49,10 @@ static void menuProperties();

static void menuQuit(); static void menuRefresh(); static void menuRefreshAll(); -void menuApply(); static void menuAbout(); -static gboolean view_onPopupMenu (GtkWidget *treeview, gpointer userdata); -static gboolean view_onButtonPressed (GtkWidget *treeview, GdkEventButton *event, gpointer userdata); +static gboolean view_onPopupMenu(GtkWidget *treeview, gpointer userdata); +static gboolean view_onButtonPressed(GtkWidget *treeview, GdkEventButton *event, gpointer userdata); static void windowSizeAllocated(); static void viewRowActivated(GtkTreeView *tree_view, GtkTreePath *path, GtkTreeViewColumn *column, gpointer user_data);

@@ -62,9 +61,6 @@ // theme files

static void selectTheme(const gchar *name); static gboolean searchTheme(const gchar *name_theme, GtkTreeModel *model, GtkTreeIter *iter); static void load_theme(); -static void initTheme(); -static void read_config(); -static void write_config(); // define menubar, toolbar and popup

@@ -107,51 +103,56 @@

// define menubar and toolbar action static GtkActionEntry entries[] = { {"ThemeMenu", NULL, _("Theme"), NULL, NULL, NULL}, - {"ThemeAdd", GTK_STOCK_ADD, _("_Add..."), "<Control>N", _("Add theme"), G_CALLBACK (menuAdd)}, - {"ThemeSaveAs", GTK_STOCK_SAVE_AS, _("_Save as..."), NULL, _("Save theme as"), G_CALLBACK (menuSaveAs)}, - {"ThemeDelete", GTK_STOCK_DELETE, _("_Delete"), NULL, _("Delete theme"), G_CALLBACK (menuDelete)}, - {"ThemeProperties", GTK_STOCK_PROPERTIES, _("_Properties..."), NULL, _("Show properties"), G_CALLBACK (menuProperties)}, - {"ThemeQuit", GTK_STOCK_QUIT, _("_Quit"), "<control>Q", _("Quit"), G_CALLBACK (menuQuit)}, + {"ThemeAdd", GTK_STOCK_ADD, _("_Add..."), "<Control>N", _("Add theme"), G_CALLBACK(menuAdd)}, + {"ThemeSaveAs", GTK_STOCK_SAVE_AS, _("_Save as..."), NULL, _("Save theme as"), G_CALLBACK(menuSaveAs)}, + {"ThemeDelete", GTK_STOCK_DELETE, _("_Delete"), NULL, _("Delete theme"), G_CALLBACK(menuDelete)}, + {"ThemeProperties", GTK_STOCK_PROPERTIES, _("_Properties..."), NULL, _("Show properties"), G_CALLBACK(menuProperties)}, + {"ThemeQuit", GTK_STOCK_QUIT, _("_Quit"), "<control>Q", _("Quit"), G_CALLBACK(menuQuit)}, {"EditMenu", NULL, "Edit", NULL, NULL, NULL}, - {"EditRefresh", GTK_STOCK_REFRESH, _("Refresh"), NULL, _("Refresh"), G_CALLBACK (menuRefresh)}, - {"EditRefreshAll", GTK_STOCK_REFRESH, _("Refresh all"), NULL, _("Refresh all"), G_CALLBACK (menuRefreshAll)}, -// {"EditPreferences", GTK_STOCK_PREFERENCES, "Preferences", NULL, "Preferences", G_CALLBACK (menuPreferences)}, - {"ViewApply", GTK_STOCK_APPLY, _("Apply"), NULL, _("Apply theme"), G_CALLBACK (menuApply)}, + {"EditRefresh", GTK_STOCK_REFRESH, _("Refresh"), NULL, _("Refresh"), G_CALLBACK(menuRefresh)}, + {"EditRefreshAll", GTK_STOCK_REFRESH, _("Refresh all"), NULL, _("Refresh all"), G_CALLBACK(menuRefreshAll)}, +// {"EditPreferences", GTK_STOCK_PREFERENCES, "Preferences", NULL, "Preferences", G_CALLBACK(menuPreferences)}, {"HelpMenu", NULL, _("Help"), NULL, NULL, NULL}, - {"HelpAbout", GTK_STOCK_ABOUT, _("_About"), "<Control>A", _("About"), G_CALLBACK (menuAbout)} + {"HelpAbout", GTK_STOCK_ABOUT, _("_About"), "<Control>A", _("About"), G_CALLBACK(menuAbout)} }; -int main (int argc, char ** argv) +int main(int argc, char **argv) { GtkWidget *vBox = NULL, *scrollbar = NULL; GtkActionGroup *actionGroup; - gtk_init (&argc, &argv); - g_thread_init( NULL ); - read_config(); - initTheme(); - g_set_application_name (_("tint2conf")); + gtk_init(&argc, &argv); + g_thread_init((NULL)); + + g_path_dir = g_build_filename(g_get_user_config_dir(), "tint2", NULL); + if (!g_file_test(g_path_dir, G_FILE_TEST_IS_DIR)) + g_mkdir(g_path_dir, 0777); + + g_path_config = g_build_filename(g_get_user_config_dir(), "tint2", "tint2rc", NULL); + + g_set_application_name(_("tint2conf")); gtk_window_set_default_icon_name("taskbar"); // config file use '.' as decimal separator setlocale(LC_NUMERIC, "POSIX"); // define main layout : container, menubar, toolbar - g_window = gtk_window_new (GTK_WINDOW_TOPLEVEL); + g_window = gtk_window_new(GTK_WINDOW_TOPLEVEL); gtk_window_set_title(GTK_WINDOW(g_window), _("Panel theming")); + g_width = 800, g_height = 600; gtk_window_resize(GTK_WINDOW(g_window), g_width, g_height); - g_signal_connect(G_OBJECT(g_window), "destroy", G_CALLBACK (menuQuit), NULL); + g_signal_connect(G_OBJECT(g_window), "destroy", G_CALLBACK(menuQuit), NULL); g_signal_connect(g_window, "size-allocate", G_CALLBACK(windowSizeAllocated), NULL); - vBox = gtk_vbox_new (FALSE, 0); - gtk_container_add (GTK_CONTAINER(g_window), vBox); + vBox = gtk_vbox_new(FALSE, 0); + gtk_container_add(GTK_CONTAINER(g_window), vBox); - actionGroup = gtk_action_group_new ("menuActionGroup"); - gtk_action_group_add_actions (actionGroup, entries, G_N_ELEMENTS (entries), NULL); + actionGroup = gtk_action_group_new("menuActionGroup"); + gtk_action_group_add_actions(actionGroup, entries, G_N_ELEMENTS(entries), NULL); globalUIManager = gtk_ui_manager_new(); - gtk_ui_manager_insert_action_group (globalUIManager, actionGroup, 0); - gtk_ui_manager_add_ui_from_string (globalUIManager, global_ui, -1, NULL ); - g_signal_connect(globalUIManager, "add_widget", G_CALLBACK (menuAddWidget), vBox); + gtk_ui_manager_insert_action_group(globalUIManager, actionGroup, 0); + gtk_ui_manager_add_ui_from_string(globalUIManager, global_ui, -1, (NULL)); + g_signal_connect(globalUIManager, "add_widget", G_CALLBACK(menuAddWidget), vBox); gtk_ui_manager_ensure_update(globalUIManager); scrollbar = gtk_scrolled_window_new(NULL, NULL); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrollbar), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);

@@ -169,12 +170,12 @@ // load themes

load_theme(g_theme_view); gtk_widget_show_all(g_window); - gtk_main (); + gtk_main(); return 0; } -static void menuAddWidget (GtkUIManager * p_uiManager, GtkWidget * p_widget, GtkContainer * p_box) +static void menuAddWidget(GtkUIManager * p_uiManager, GtkWidget * p_widget, GtkContainer * p_box) { gtk_box_pack_start(GTK_BOX(p_box), p_widget, FALSE, FALSE, 0); gtk_widget_show(p_widget);

@@ -183,7 +184,7 @@

static void menuAbout() { - const char *authors[] = { "Thierry Lorthiois <lorthiois@bbsoft.fr>", "Andreas Fink <andreas.fink85@googlemail.com>", "Christian Ruppert <Spooky85@gmail.com> (Build system)", "Euan Freeman <euan04@gmail.com> (tintwizard)\n See http://code.google.com/p/tintwizard/", NULL }; + const char *authors[] = { "Thierry Lorthiois <lorthiois@bbsoft.fr>", "Andreas Fink <andreas.fink85@googlemail.com>", "Christian Ruppert <Spooky85@gmail.com> (Build system)", "Euan Freeman <euan04@gmail.com> (tintwizard)\n See http://code.google.com/p/tintwizard/", (NULL)}; gtk_show_about_dialog(GTK_WINDOW(g_window), "name", g_get_application_name( ), "comments", _("Theming tool for tint2 panel"),

@@ -204,21 +205,21 @@ GtkWidget *dialog;

GtkFileChooser *chooser; GtkFileFilter *filter; - dialog = gtk_file_chooser_dialog_new(_("Add a theme"), GTK_WINDOW(g_window), GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_ADD, GTK_RESPONSE_ACCEPT, NULL); + dialog = gtk_file_chooser_dialog_new(_("Add a theme"), GTK_WINDOW(g_window), GTK_FILE_CHOOSER_ACTION_SAVE, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_ADD, GTK_RESPONSE_ACCEPT, NULL); chooser = GTK_FILE_CHOOSER(dialog); gchar *config_dir; config_dir = g_build_filename(g_get_home_dir(), ".config", "tint2", NULL); gtk_file_chooser_set_current_folder(chooser, config_dir); g_free(config_dir); - gtk_file_chooser_set_select_multiple(chooser, TRUE); filter = gtk_file_filter_new(); gtk_file_filter_set_name(filter, _("Tint2 theme files")); gtk_file_filter_add_pattern(filter, "*tint2rc"); gtk_file_chooser_add_filter(chooser, filter); + gtk_file_chooser_set_do_overwrite_confirmation(chooser, TRUE); - if (gtk_dialog_run (GTK_DIALOG(dialog)) != GTK_RESPONSE_ACCEPT) { + if (gtk_dialog_run(GTK_DIALOG(dialog)) != GTK_RESPONSE_ACCEPT) { gtk_widget_destroy(dialog); return; }

@@ -235,17 +236,10 @@ pt1++;

if (*pt1 == 0) continue; name = g_strdup(pt1); - path = g_build_filename (g_get_user_config_dir(), "tint2", name, NULL); + path = g_build_filename(g_get_user_config_dir(), "tint2", name, NULL); // check existing if (searchTheme(path, model, &iter)) { - gchar *message; - message = g_strdup_printf(_("Couldn't add duplicate theme\n\'%s\'."), pt1); - - GtkWidget *w = gtk_message_dialog_new(GTK_WINDOW(g_window), 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, message, NULL); - g_signal_connect_swapped(w, "response", G_CALLBACK(gtk_widget_destroy), w); - gtk_widget_show(w); - g_free(message); continue; }

@@ -267,7 +261,7 @@ g_timeout_add(SNAPSHOT_TICK, (GSourceFunc)update_snapshot, NULL);

} -static void menuSaveAs () +static void menuSaveAs() { GtkWidget *dialog; GtkFileChooser *chooser;

@@ -285,7 +279,7 @@ return;

} gtk_tree_model_get(model, &iter, COL_THEME_FILE, &file, -1); - pt1 = strrchr (file, '/'); + pt1 = strrchr(file, '/'); if (pt1) pt1++; dialog = gtk_file_chooser_dialog_new(_("Save theme as"), GTK_WINDOW(g_window), GTK_FILE_CHOOSER_ACTION_SAVE, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, NULL);

@@ -301,10 +295,10 @@

if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) { char *filename = gtk_file_chooser_get_filename(chooser); copy_file(file, filename); - g_free (filename); + g_free(filename); } g_free(file); - gtk_widget_destroy (dialog); + gtk_widget_destroy(dialog); }

@@ -365,8 +359,6 @@

static void menuQuit() { - write_config(); - if (g_path_config) g_free(g_path_config); if (g_path_dir)

@@ -374,7 +366,7 @@ g_free(g_path_dir);

if (g_default_theme) g_free(g_default_theme); - gtk_main_quit (); + gtk_main_quit(); }

@@ -409,37 +401,6 @@

g_timeout_add(SNAPSHOT_TICK, (GSourceFunc)update_snapshot, NULL); } - -void menuApply() -{ - GtkTreeSelection *sel; - GtkTreeIter iter; - GtkTreeModel *model; - - if (g_default_theme) { - g_free(g_default_theme); - g_default_theme = NULL; - } - sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(g_theme_view)); - if (gtk_tree_selection_get_selected(GTK_TREE_SELECTION(sel), &model, &iter)) { - gtk_tree_model_get(model, &iter, COL_THEME_FILE, &g_default_theme, -1); - // Create backup if the config file has been edited manually - if (config_is_manual(g_path_config)) { - char timestamp[64]; - sprintf(timestamp, "%ld", time(NULL)); - gchar *backup_path = g_build_filename(g_get_user_config_dir(), "tint2", "tint2rc.backup.", timestamp, NULL); - copy_file(g_path_config, backup_path); - g_free(backup_path); - } - // Write config file - printf("Writing %s to %s\n", g_default_theme, g_path_config); - copy_file(g_default_theme, g_path_config); - // Restart panel - int unused = system("killall -SIGUSR1 tint2"); - (void)unused; - } -} - static void view_popup_menu(GtkWidget *treeview, GdkEventButton *event, gpointer userdata) { GtkWidget *w = gtk_ui_manager_get_widget(globalUIManager, "/ThemePopup");

@@ -447,7 +408,7 @@

gtk_menu_popup(GTK_MENU(w), NULL, NULL, NULL, NULL, (event != NULL) ? event->button : 0, gdk_event_get_time((GdkEvent*)event)); } -static gboolean view_onButtonPressed (GtkWidget *treeview, GdkEventButton *event, gpointer userdata) +static gboolean view_onButtonPressed(GtkWidget *treeview, GdkEventButton *event, gpointer userdata) { // single click with the right mouse button? if (event->type == GDK_BUTTON_PRESS && event->button == 3) {

@@ -472,56 +433,91 @@ }

return FALSE; } -static gboolean view_onPopupMenu (GtkWidget *treeview, gpointer userdata) +static gboolean view_onPopupMenu(GtkWidget *treeview, gpointer userdata) { view_popup_menu(treeview, NULL, userdata); return TRUE; } static void viewRowActivated(GtkTreeView *tree_view, GtkTreePath *path, GtkTreeViewColumn *column, gpointer user_data) -{ - menuApply(); -} +{} static void windowSizeAllocated() { const gboolean isMaximized = g_window->window && (gdk_window_get_state(g_window->window) & GDK_WINDOW_STATE_MAXIMIZED); - if(!isMaximized) + if (!isMaximized) gtk_window_get_size(GTK_WINDOW(g_window), &g_width, &g_height); } +int endswith(const char *str, const char *suffix) +{ + return strlen(str) >= strlen(suffix) && + strcmp(str + strlen(str) - strlen(suffix), suffix) == 0; +} + static void load_theme(GtkWidget *list) { GDir *dir; gchar *name; - const gchar *file; - gboolean found_theme = FALSE; + const gchar *file_name; + int found_theme; dir = g_dir_open(g_path_dir, 0, NULL); if (dir == NULL) return; - while ((file = g_dir_read_name(dir))) { - if (g_str_has_suffix(file, ".tint2rc")) { + while ((file_name = g_dir_read_name(dir))) { + if (!g_file_test(file_name, G_FILE_TEST_IS_DIR) && + !strstr(file_name, "backup") && + !strstr(file_name, "copy") && + !strstr(file_name, "~") && + (endswith(file_name, "tint2rc") || + endswith(file_name, ".conf"))) { found_theme = TRUE; - name = g_build_filename (g_path_dir, file, NULL); + name = g_build_filename(g_path_dir, file_name, NULL); custom_list_append(name); g_free(name); } } - g_dir_close(dir); if (!found_theme) { - // create default theme file - name = g_build_filename(g_get_user_config_dir(), "tint2", "default.tint2rc", NULL); - copy_file(g_path_config, name); - custom_list_append(name); - if (g_default_theme) - g_free(g_default_theme); - g_default_theme = strdup(name); - g_free(name); + // create default config // TODO + + // copy tint2rc from system directory to user directory + gchar *path2 = 0; + const gchar * const * system_dirs = g_get_system_config_dirs(); + int i; + for (i = 0; system_dirs[i]; i++) { + path2 = g_build_filename(system_dirs[i], "tint2", "tint2rc", NULL); + if (g_file_test(path2, G_FILE_TEST_EXISTS)) + break; + g_free(path2); + path2 = 0; + } + + if (path2) { + // copy file in user directory (path1) + gchar *dir = g_build_filename(g_get_user_config_dir(), "tint2", NULL); + if (!g_file_test(dir, G_FILE_TEST_IS_DIR)) + g_mkdir(dir, 0777); + g_free(dir); + + gchar *path1 = g_build_filename (g_get_user_config_dir(), "tint2", "tint2rc", NULL); + copy_file(path2, path1); + g_free(path2); + g_free(path1); + } else { + // create empty file + gchar *path1 = g_build_filename (g_get_user_config_dir(), "tint2", "tint2rc", NULL); + copy_file("/dev/null", path1); + g_free(path1); + } + load_theme(list); + return; } + + g_dir_close(dir); selectTheme(g_default_theme);

@@ -534,10 +530,18 @@ gboolean have_iter, found_theme;

GtkTreeIter iter; GtkTreeModel *model; - if (!name_theme) + model = gtk_tree_view_get_model(GTK_TREE_VIEW(g_theme_view)); + if (!name_theme) { + have_iter = gtk_tree_model_get_iter_first(model, &iter); + if (have_iter) { + GtkTreePath *path = gtk_tree_model_get_path(model, &iter); + gtk_tree_selection_select_iter(gtk_tree_view_get_selection(GTK_TREE_VIEW(g_theme_view)), &iter); + gtk_tree_view_scroll_to_cell(GTK_TREE_VIEW(g_theme_view), path, NULL, FALSE, 0, 0); + gtk_tree_path_free(path); + } return; + } - model = gtk_tree_view_get_model(GTK_TREE_VIEW(g_theme_view)); found_theme = searchTheme(name_theme, model, &iter); GtkTreePath *path = NULL;

@@ -571,73 +575,3 @@ have_iter = gtk_tree_model_iter_next(model, iter);

} return found; } - -// Initializes the paths to the tint2 config locations. -void initTheme() -{ - g_path_dir = g_build_filename (g_get_user_config_dir(), "tint2", NULL); - if (!g_file_test (g_path_dir, G_FILE_TEST_IS_DIR)) - g_mkdir(g_path_dir, 0777); - - g_path_config = g_build_filename (g_get_user_config_dir(), "tint2", "tint2rc", NULL); -} - -// Reads the tint2conf config file. -void read_config() -{ - char *path; - - // default values - if (g_default_theme != NULL) { - g_free(g_default_theme); - g_default_theme = NULL; - } - g_width = 500; - g_height = 350; - - // load config - path = g_build_filename (g_get_user_config_dir(), "tint2", "tint2confrc", NULL); - if (g_file_test (path, G_FILE_TEST_EXISTS)) { - FILE *fp; - char line[80]; - char *key, *value; - if ((fp = fopen(path, "r")) != NULL) { - while (fgets(line, sizeof(line), fp) != NULL) { - if (parse_line(line, &key, &value)) { - if (strcmp (key, "default_theme") == 0) - g_default_theme = strdup(value); - else if (strcmp (key, "width") == 0) - g_width = atoi(value); - else if (strcmp (key, "height") == 0) - g_height = atoi(value); - free (key); - free (value); - } - } - fclose (fp); - } - } - g_free(path); -} - -// Writes the tint2conf config file. -void write_config() -{ - char *path; - FILE *fp; - - path = g_build_filename (g_get_user_config_dir(), "tint2", "tint2confrc", NULL); - fp = fopen(path, "w"); - if (fp != NULL) { - fputs("#---------------------------------------------\n", fp); - fputs("# TINT2CONF CONFIG FILE\n", fp); - if (g_default_theme != NULL) { - fprintf(fp, "default_theme = %s\n", g_default_theme); - } - fprintf(fp, "width = %d\n", g_width); - fprintf(fp, "height = %d\n", g_height); - fputs("\n", fp); - fclose (fp); - } - g_free(path); -}
M src/tint2conf/properties.csrc/tint2conf/properties.c

@@ -165,10 +165,10 @@ {

char *file = get_current_theme_file_name(); if (file) config_save_file(file); + int unused = system("killall -SIGUSR1 tint2"); + (void)unused; g_free(file); g_timeout_add(SNAPSHOT_TICK, (GSourceFunc)update_snapshot, NULL); - // TODO if this is not the current theme, don't do anything - menuApply(); } void cancelClicked(GtkWidget *widget, gpointer data)