*
* Tint2conf
*
-* Copyright (C) 2009 Thierry lorthiois (lorthiois@bbsoft.fr)
+* Copyright (C) 2009 Thierry lorthiois (lorthiois@bbsoft.fr) from Omega distribution
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License version 2
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
**************************************************************************/
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <locale.h>
-#include <X11/Xlib.h>
-#include <gdk/gdkx.h>
-#include <gtk/gtk.h>
-#include <glib.h>
-#include <glib/gstdio.h>
-#include <glib/gi18n.h>
-
-#include "../version.h"
+#ifdef HAVE_VERSION_H
+ #include "version.h"
+#endif
+#include "main.h"
#include "common.h"
#include "theme_view.h"
+#include "properties.h"
+#define SNAPSHOT_TICK 190
// default config file and directory
char *g_path_config = NULL;
char *g_path_dir = NULL;
char *g_default_theme = NULL;
+char *g_cmd_property = NULL;
int g_width, g_height;
GtkWidget *g_window;
-GtkWidget *g_theme_view;
static GtkUIManager *globalUIManager = NULL;
static void menuQuit();
static void menuRefresh();
static void menuRefreshAll();
-static void menuPreferences();
static void menuApply();
static void menuAbout();
// 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();
-static void check_theme();
// define menubar, toolbar and popup
" <menuitem action='ThemeSaveAs'/>"
" <separator/>"
" <menuitem action='ThemeDelete'/>"
- " <separator/>"
-// " <menuitem action='ThemeProperties'/>"
// " <separator/>"
+// " <menuitem action='ThemeProperties'/>"
+ " <separator/>"
" <menuitem action='ThemeQuit'/>"
" </menu>"
" <menu action='EditMenu'>"
" </menu>"
" </menubar>"
" <toolbar name='ToolBar'>"
- " <toolitem action='ThemeProperties'/>"
+// " <toolitem action='ThemeProperties'/>"
" <toolitem action='ViewApply'/>"
" </toolbar>"
" <popup name='ThemePopup'>"
+// " <menuitem action='ThemeProperties'/>"
" <menuitem action='EditRefresh'/>"
- " <menuitem action='ThemeProperties'/>"
" <menuitem action='ViewApply'/>"
" <separator/>"
" <menuitem action='ThemeDelete'/>"
// 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)},
+ {"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)},
{"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)},
+ {"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)},
- {"HelpMenu", NULL, "Help", NULL, NULL, NULL},
- {"HelpAbout", GTK_STOCK_ABOUT, "_About", "<Control>A", "About", G_CALLBACK (menuAbout)}
+ {"ViewApply", GTK_STOCK_APPLY, _("Apply"), NULL, _("Apply theme"), G_CALLBACK (menuApply)},
+ {"HelpMenu", NULL, _("Help"), NULL, NULL, NULL},
+ {"HelpAbout", GTK_STOCK_ABOUT, _("_About"), "<Control>A", _("About"), G_CALLBACK (menuAbout)}
};
gtk_init (&argc, &argv);
g_thread_init( NULL );
read_config();
- check_theme();
+ initTheme();
+ g_set_application_name (_("tint2conf"));
+ gtk_window_set_default_icon_name("taskbar");
// define main layout : container, menubar, toolbar
g_window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
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);
+ 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);
+ 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_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);
// define theme view
g_theme_view = create_view();
gtk_container_add(GTK_CONTAINER(scrollbar), g_theme_view);
- gtk_widget_show(g_theme_view);
+ gtk_widget_show(g_theme_view);
g_signal_connect(g_theme_view, "button-press-event", (GCallback)view_onButtonPressed, NULL);
g_signal_connect(g_theme_view, "popup-menu", (GCallback)view_onPopupMenu, NULL);
g_signal_connect(g_theme_view, "row-activated", G_CALLBACK(viewRowActivated), NULL);
- // load themes
+ // load themes
load_theme(g_theme_view);
- // rig up idle/thread routines
- //Glib::Thread::create(sigc::mem_fun(window.view, &Thumbview::load_cache_images), true);
- //Glib::Thread::create(sigc::mem_fun(window.view, &Thumbview::create_cache_images), true);
-
gtk_widget_show_all(g_window);
gtk_main ();
return 0;
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);
+ gtk_box_pack_start(GTK_BOX(p_box), p_widget, FALSE, FALSE, 0);
+ gtk_widget_show(p_widget);
}
{
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(g_window, "name", g_get_application_name( ),
+ gtk_show_about_dialog(GTK_WINDOW(g_window), "name", g_get_application_name( ),
"comments", _("Theming tool for tint2 panel"),
"version", VERSION_STRING,
"copyright", _("Copyright 2009 tint2 team\nTint2 License GNU GPL version 2\nTintwizard License GNU GPL version 3"),
- "logo-icon-name", NULL, "authors", authors,
+ "logo-icon-name", "taskbar", "authors", authors,
/* Translators: translate "translator-credits" as
your name to have it appear in the credits in the "About"
dialog */
GtkFileChooser *chooser;
GtkFileFilter *filter;
- dialog = gtk_file_chooser_dialog_new(_("Add a theme"), 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_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_ADD, GTK_RESPONSE_ACCEPT, NULL);
chooser = GTK_FILE_CHOOSER(dialog);
gtk_file_chooser_set_current_folder(chooser, g_get_home_dir());
gtk_file_filter_add_pattern(filter, "*.tint2rc");
gtk_file_chooser_add_filter(chooser, filter);
- if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) {
- GSList *l, *list = gtk_file_chooser_get_filenames(chooser);
-
- gchar *file, *pt1, *name, *path;
- for (l = list; l ; l = l->next) {
- file = (char *)l->data;
- pt1 = strrchr (file, '/');
- if (pt1) {
- pt1++;
- if (*pt1) {
- name = g_strdup(pt1);
- path = g_build_filename (g_get_user_config_dir(), "tint2", name, NULL);
- copy_file(file, path);
- custom_list_append(path);
- g_free(path);
- g_free(name);
- }
- }
+ if (gtk_dialog_run (GTK_DIALOG(dialog)) != GTK_RESPONSE_ACCEPT) {
+ gtk_widget_destroy(dialog);
+ return;
+ }
+
+ GtkTreeIter iter;
+ GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(g_theme_view));
+ GSList *l, *list = gtk_file_chooser_get_filenames(chooser);
+ gchar *file, *pt1, *name, *path, *name_first=NULL;
+ for (l = list; l ; l = l->next) {
+ file = (char *)l->data;
+ pt1 = strrchr(file, '/');
+ if (pt1 == NULL) continue;
+ pt1++;
+ if (*pt1 == 0) continue;
+
+ name = g_strdup(pt1);
+ 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;
}
- g_slist_foreach(list, (GFunc)g_free, NULL);
- g_slist_free(list);
+ // append theme
+ copy_file(file, path);
+ custom_list_append(path);
+ if (name_first == NULL)
+ name_first = g_strdup(path);
+ g_free(path);
+ g_free(name);
}
- gtk_widget_destroy (dialog);
+ g_slist_foreach(list, (GFunc)g_free, NULL);
+ g_slist_free(list);
+ gtk_widget_destroy(dialog);
+
+ selectTheme(name_first);
+ g_free(name_first);
+ g_timeout_add(SNAPSHOT_TICK, (GSourceFunc)update_snapshot, 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)) {
- GtkWidget *w = gtk_message_dialog_new(g_window, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, _("Select the theme to be saved."), NULL);
+ GtkWidget *w = gtk_message_dialog_new(GTK_WINDOW(g_window), 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, _("Select the theme to be saved."));
g_signal_connect_swapped(w, "response", G_CALLBACK(gtk_widget_destroy), w);
gtk_widget_show(w);
return;
pt1 = strrchr (file, '/');
if (pt1) pt1++;
- dialog = gtk_file_chooser_dialog_new(_("Save theme as"), g_window, GTK_FILE_CHOOSER_ACTION_SAVE, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, NULL);
+ 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);
chooser = GTK_FILE_CHOOSER(dialog);
gtk_file_chooser_set_do_overwrite_confirmation(chooser, TRUE);
GtkTreeSelection *sel;
GtkTreeIter iter;
GtkTreeModel *model;
- gchar *file;
+ gchar *filename;
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, &file, -1);
+ gtk_tree_model_get(model, &iter, COL_THEME_FILE, &filename, -1);
gtk_tree_selection_unselect_all(sel);
- // remove (gui and disk)
+ // remove (gui and file)
gtk_list_store_remove(GTK_LIST_STORE(model), &iter);
- g_remove(file);
- g_free(file);
+ GFile *file = g_file_new_for_path(filename);
+ g_file_trash(file, NULL, NULL);
+ g_object_unref(G_OBJECT(file));
+ g_free(filename);
}
}
GtkTreeSelection *sel;
GtkTreeIter iter;
GtkTreeModel *model;
- char *file, *cmd;
+ char *file;
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, &file, -1);
-
- cmd = g_strdup_printf("gedit \'%s\' &", file);
+//*
+ GtkWidget *prop;
+ prop = create_properties();
+ gtk_window_present(GTK_WINDOW(prop));
+ //printf("menuProperties : fin\n");
+//*/
+/*
+ char *cmd = g_strdup_printf("%s \'%s\' &", g_cmd_property, file);
+ printf("cmd %s\n", cmd);
system(cmd);
-
g_free(cmd);
+ //*/
g_free(file);
+
}
}
g_free(g_path_dir);
if (g_default_theme)
g_free(g_default_theme);
+ if (g_cmd_property)
+ g_free(g_cmd_property);
gtk_main_quit ();
}
static void menuRefresh()
{
- printf("menuRefresh\n");
+ GtkTreeSelection *sel;
+ GtkTreeIter iter;
+ GtkTreeModel *model;
+
+ 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_list_store_set(g_store, &iter, COL_SNAPSHOT, NULL, -1);
+ }
+
+ g_timeout_add(SNAPSHOT_TICK, (GSourceFunc)update_snapshot, NULL);
}
static void menuRefreshAll()
{
- printf("menuRefreshAll\n");
-}
+ GtkTreeIter iter;
+ GtkTreeModel *model;
+ gboolean have_iter;
+ model = gtk_tree_view_get_model(GTK_TREE_VIEW(g_theme_view));
+ have_iter = gtk_tree_model_get_iter_first(model, &iter);
+ while (have_iter) {
+ gtk_list_store_set(g_store, &iter, COL_SNAPSHOT, NULL, -1);
+ have_iter = gtk_tree_model_iter_next(model, &iter);
+ }
-static void menuPreferences()
-{
- printf("menuPreferences\n");
+ g_timeout_add(SNAPSHOT_TICK, (GSourceFunc)update_snapshot, NULL);
}
static void load_theme(GtkWidget *list)
{
GDir *dir;
- gchar *pt1, *name, *file;
- gboolean have_iter, found_theme = FALSE;
- GtkTreeIter iter;
- GtkTreeModel *model;
+ gchar *pt1, *name;
+ const gchar *file;
+ gboolean found_theme = FALSE;
dir = g_dir_open(g_path_dir, 0, NULL);
if (dir == NULL) return;
if (!found_theme) {
// create default theme file
- name = g_build_filename (g_get_user_config_dir(), "tint2", "default.tint2rc", NULL);
+ 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);
}
- // search default theme
- found_theme = FALSE;
+ selectTheme(g_default_theme);
+
+ g_timeout_add(SNAPSHOT_TICK, (GSourceFunc)update_snapshot, NULL);
+}
+
+
+void selectTheme(const gchar *name_theme)
+{
+ gboolean have_iter, found_theme;
+ GtkTreeIter iter;
+ GtkTreeModel *model;
+
+ if (!name_theme) return;
+
model = gtk_tree_view_get_model(GTK_TREE_VIEW(g_theme_view));
- have_iter = gtk_tree_model_get_iter_first(model, &iter);
- while (have_iter) {
- gtk_tree_model_get(model, &iter, COL_THEME_FILE, &name, -1);
- found_theme = (strcmp(name, g_default_theme) == 0);
- g_free(name);
- if (found_theme)
- break;
- have_iter = gtk_tree_model_iter_next(model, &iter);
- }
+ found_theme = searchTheme(name_theme, model, &iter);
- // select theme
GtkTreePath *path = NULL;
if (found_theme)
path = gtk_tree_model_get_path(model, &iter);
gtk_tree_view_scroll_to_cell(GTK_TREE_VIEW(g_theme_view), path, NULL, FALSE, 0, 0);
gtk_tree_path_free(path);
}
+}
+
+
+gboolean searchTheme(const gchar *name_theme, GtkTreeModel *model, GtkTreeIter *iter)
+{
+ gchar *name;
+ gboolean have_iter, found = FALSE;
+
+ have_iter = gtk_tree_model_get_iter_first(model, iter);
+ while (have_iter) {
+ gtk_tree_model_get(model, iter, COL_THEME_FILE, &name, -1);
+ found = (strcmp(name, name_theme) == 0);
+ g_free(name);
+ if (found)
+ break;
+ have_iter = gtk_tree_model_iter_next(model, iter);
+ }
+ return found;
+}
+
+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);
}
-// theme file management
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;
+ g_cmd_property = g_strconcat( "/usr/bin/env python ", INSTALL_PREFIX, "/bin/tintwizard.py", (void*)0 );
+
+ // 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;
while (fgets(line, sizeof(line), fp) != NULL) {
if (parse_line(line, &key, &value)) {
if (strcmp (key, "default_theme") == 0)
- g_default_theme = strdup (value);
+ g_default_theme = strdup(value);
+ else if (strcmp (key, "cmd_property") == 0) {
+ g_free(g_cmd_property);
+ g_cmd_property = strdup(value);
+ }
else if (strcmp (key, "width") == 0)
g_width = atoi(value);
else if (strcmp (key, "height") == 0)
fputs("# TINT2CONF CONFIG FILE\n", fp);
if (g_default_theme != NULL) {
fprintf(fp, "default_theme = %s\n", g_default_theme);
- printf("default_theme %s\n", g_default_theme);
+ }
+ if (g_cmd_property != NULL) {
+ fprintf(fp, "cmd_property = %s\n", g_cmd_property);
}
fprintf(fp, "width = %d\n", g_width);
fprintf(fp, "height = %d\n", g_height);
}
-void check_theme()
-{
- 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);
-
-}
-
-
projects / chaz / tint2 / blobdiff