char *g_path_dir = NULL;
char *g_default_theme = NULL;
int g_width, g_height;
-int g_width_list, g_height_list;
GtkWidget *g_window;
GtkWidget *g_theme_view;
-GtkCellRenderer *g_renderer;
-CustomList *customlist;
-
-// The data columns that we export via the tree model interface
-GtkListStore *g_store;
-enum { COL_THEME_FILE = 0, COL_SNAPSHOT, NB_COL, };
-static void custom_list_append(const gchar *name);
-#define STEP 0.01
-static gboolean increasing = TRUE;
-//gboolean increase_timeout(GtkCellRenderer *renderer);
static GtkUIManager *globalUIManager = NULL;
static void menuAddWidget (GtkUIManager *, GtkWidget *, GtkContainer *);
-static GtkWidget *create_view();
// action on menus
-static void menuAdd (GtkWindow * parent);
-static void menuSaveAs (GtkWindow *parent);
-static void menuDelete (void);
-static void menuProperties (void);
-static void menuQuit (void);
-static void menuRefresh (void);
-static void menuRefreshAll (void);
-static void menuPreferences (void);
-static void menuApply (void);
-static void menuAbout(GtkWindow * parent);
+static void menuAdd();
+static void menuSaveAs();
+static void menuDelete();
+static void menuProperties();
+static void menuQuit();
+static void menuRefresh();
+static void menuRefreshAll();
+static void menuPreferences();
+static void menuApply();
+static void menuAbout();
static gboolean view_onPopupMenu (GtkWidget *treeview, gpointer userdata);
static gboolean view_onButtonPressed (GtkWidget *treeview, GdkEventButton *event, gpointer userdata);
-static void viewRowActivated( GtkTreeView *tree_view, GtkTreePath *path, GtkTreeViewColumn *column, gpointer user_data);
+static void windowSizeAllocated();
+static void viewRowActivated(GtkTreeView *tree_view, GtkTreePath *path, GtkTreeViewColumn *column, gpointer user_data);
// theme files
" <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='ViewApply'/>"
" <toolitem action='ThemeProperties'/>"
+ " <toolitem action='ViewApply'/>"
" </toolbar>"
" <popup name='ThemePopup'>"
- " <menuitem action='ViewApply'/>"
+ " <menuitem action='EditRefresh'/>"
" <menuitem action='ThemeProperties'/>"
+ " <menuitem action='ViewApply'/>"
" <separator/>"
" <menuitem action='ThemeDelete'/>"
" </popup>"
g_thread_init( NULL );
read_config();
check_theme();
- g_width = 300;
- g_height = 400;
// define main layout : container, menubar, toolbar
g_window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
gtk_window_set_title(GTK_WINDOW(g_window), _("Panel theming"));
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);
}
-GtkWidget *create_view()
-{
- GtkTreeViewColumn *col;
- GtkCellRenderer *renderer;
- GtkWidget *view;
-
- g_store = gtk_list_store_new(NB_COL, G_TYPE_STRING, GDK_TYPE_PIXBUF);
-// g_store = gtk_list_store_new(NB_COL, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_FLOAT);
-
- view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(g_store));
- gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(view), TRUE);
- //gtk_tree_view_set_fixed_height_mode(GTK_TREE_VIEW(view), TRUE);
-
- g_object_unref(g_store); // destroy store automatically with view
-
- renderer = gtk_cell_renderer_text_new();
- col = gtk_tree_view_column_new();
- gtk_tree_view_column_pack_start (col, renderer, TRUE);
- gtk_tree_view_column_add_attribute (col, renderer, "text", COL_THEME_FILE);
- gtk_tree_view_column_set_title (col, "Theme");
- gtk_tree_view_append_column(GTK_TREE_VIEW(view),col);
-
- g_width_list = 200;
- g_height_list = 30;
- g_renderer = gtk_cell_renderer_pixbuf_new();
- g_object_set(g_renderer, "xalign", 0.0, NULL);
- gtk_cell_renderer_set_fixed_size(g_renderer, g_width_list, g_height_list);
- col = gtk_tree_view_column_new();
- gtk_tree_view_column_pack_start(col, g_renderer, TRUE);
- gtk_tree_view_column_add_attribute(col, g_renderer, "pixbuf", COL_SNAPSHOT);
- gtk_tree_view_column_set_title(col, "Snapshot");
- gtk_tree_view_append_column(GTK_TREE_VIEW(view),col);
-/*
- renderer = custom_list_new();
- col = gtk_tree_view_column_new();
- gtk_tree_view_column_pack_start (col, renderer, TRUE);
- gtk_tree_view_column_add_attribute (col, renderer, "snapshot", COL_SNAPSHOT);
- gtk_tree_view_column_set_title (col, "Snapshot");
- gtk_tree_view_append_column(GTK_TREE_VIEW(view),col);
-*/
- //g_timeout_add(50, (GSourceFunc) increase_timeout, NULL);
-
- return view;
-}
-
-
-/*
-gboolean increase_timeout (GtkCellRenderer *renderer)
-{
- GtkTreeIter iter;
- gfloat perc = 0.0;
- //gchar buf[20];
-
- gtk_tree_model_get_iter_first(GTK_TREE_MODEL(g_store), &iter);
-
- gtk_tree_model_get (GTK_TREE_MODEL(g_store), &iter, COL_SNAPSHOT, &perc, -1);
-
- if ( perc > (1.0-STEP) || (perc < STEP && perc > 0.0) )
- {
- increasing = (!increasing);
- }
-
- if (increasing)
- perc = perc + STEP;
- else
- perc = perc - STEP;
-
- //g_snprintf(buf, sizeof(buf), "%u %%", (guint)(perc*100));
-
- gtk_list_store_set (g_store, &iter, COL_SNAPSHOT, perc, -1);
-
- return TRUE;
-}
-*/
-/*****************************************************************************
- *
- * custom_list_append_record: Empty lists are boring. This function can
- * be used in your own code to add rows to the
- * list. Note how we emit the "row-inserted"
- * signal after we have appended the row
- * internally, so the tree view and other
- * interested objects know about the new row.
- *
- *****************************************************************************/
-
-void custom_list_append(const gchar *name)
-{
- GtkTreeIter iter;
- gchar *snap, *cmd;
- gint pixWidth, pixHeight;
- gboolean changeSize = FALSE;
- GdkPixbuf *icon;
-
- // build panel's snapshot
- snap = g_build_filename (g_get_user_config_dir(), "tint2", "snap.jpg", NULL);
- cmd = g_strdup_printf("tint2 -c %s -s %s", name, snap);
- system(cmd);
- g_free(cmd);
-
- // load
- icon = gdk_pixbuf_new_from_file(snap, NULL);
- g_free(snap);
- if (!icon)
- return;
-
- pixWidth = gdk_pixbuf_get_width(icon);
- pixHeight = gdk_pixbuf_get_height(icon);
- if (g_width_list < pixWidth) {
- g_width_list = pixWidth;
- changeSize = TRUE;
- }
- if (g_height_list < (pixHeight+6)) {
- g_height_list = pixHeight+6;
- changeSize = TRUE;
- }
- if (changeSize)
- gtk_cell_renderer_set_fixed_size(g_renderer, g_width_list, g_height_list);
-
- gtk_list_store_append(g_store, &iter);
- gtk_list_store_set(g_store, &iter, COL_THEME_FILE, name, COL_SNAPSHOT, icon, -1);
-}
-
-
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);
}
-static void menuAbout(GtkWindow * parent)
+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 };
- gtk_show_about_dialog( parent, "name", g_get_application_name( ),
+ gtk_show_about_dialog(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"),
your name to have it appear in the credits in the "About"
dialog */
"translator-credits", _("translator-credits"),
- NULL );
+ NULL);
}
-static void menuAdd (GtkWindow *parent)
+static void menuAdd()
{
GtkWidget *dialog;
GtkFileChooser *chooser;
GtkFileFilter *filter;
- dialog = gtk_file_chooser_dialog_new(_("Add a theme"), parent, 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"), 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());
}
-static void menuSaveAs (GtkWindow *parent)
+static void menuSaveAs ()
{
GtkWidget *dialog;
GtkFileChooser *chooser;
+ GtkTreeSelection *sel;
+ GtkTreeIter iter;
+ GtkTreeModel *model;
+ gchar *file, *pt1;
- dialog = gtk_file_chooser_dialog_new (_("Save theme as"), parent, GTK_FILE_CHOOSER_ACTION_SAVE, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, 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);
+ g_signal_connect_swapped(w, "response", G_CALLBACK(gtk_widget_destroy), w);
+ gtk_widget_show(w);
+ return;
+ }
+
+ gtk_tree_model_get(model, &iter, COL_THEME_FILE, &file, -1);
+ 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);
chooser = GTK_FILE_CHOOSER(dialog);
- gtk_file_chooser_set_do_overwrite_confirmation (chooser, TRUE);
- gtk_file_chooser_set_current_folder (chooser, g_get_home_dir());
- gtk_file_chooser_set_current_name (chooser, _("Untitled document"));
+ gtk_file_chooser_set_do_overwrite_confirmation(chooser, TRUE);
+ gtk_file_chooser_set_current_folder(chooser, g_get_home_dir());
+ gtk_file_chooser_set_current_name(chooser, pt1);
- if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) {
+ if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) {
char *filename = gtk_file_chooser_get_filename(chooser);
- printf("fichier %s\n", filename);
- //save_to_file (filename);
+ copy_file(file, filename);
g_free (filename);
}
+ g_free(file);
gtk_widget_destroy (dialog);
}
-static void menuDelete (void)
+static void menuDelete()
{
GtkTreeSelection *sel;
GtkTreeIter iter;
GtkTreeModel *model;
- char *file;
+ gchar *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)) {
}
-static void menuProperties (void)
+static void menuProperties()
{
GtkTreeSelection *sel;
GtkTreeIter iter;
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("tintwizard.py \'%s\'", file);
+ cmd = g_strdup_printf("gedit \'%s\' &", file);
system(cmd);
g_free(cmd);
}
-static void menuQuit (void)
+static void menuQuit()
{
write_config();
+
+ if (g_path_config)
+ g_free(g_path_config);
+ if (g_path_dir)
+ g_free(g_path_dir);
+ if (g_default_theme)
+ g_free(g_default_theme);
+
gtk_main_quit ();
}
-static void menuRefresh (void)
+static void menuRefresh()
{
printf("menuRefresh\n");
}
-static void menuRefreshAll (void)
+static void menuRefreshAll()
{
printf("menuRefreshAll\n");
}
-static void menuPreferences (void)
+static void menuPreferences()
{
printf("menuPreferences\n");
}
-static void menuApply (void)
+static void menuApply()
{
GtkTreeSelection *sel;
GtkTreeIter iter;
GtkTreeModel *model;
- char *file;
+ 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, &file, -1);
-
+ gtk_tree_model_get(model, &iter, COL_THEME_FILE, &g_default_theme, -1);
// overwrite tint2rc
- copy_file(file, g_path_config);
- g_free(file);
+ copy_file(g_default_theme, g_path_config);
// restart panel
system("killall -SIGUSR1 tint2");
}
+static void windowSizeAllocated()
+{
+ const gboolean isMaximized = g_window->window && (gdk_window_get_state(g_window->window) & GDK_WINDOW_STATE_MAXIMIZED);
+
+ if(!isMaximized)
+ gtk_window_get_size(GTK_WINDOW(g_window), &g_width, &g_height);
+}
+
+
static void load_theme(GtkWidget *list)
{
GDir *dir;
gchar *pt1, *name, *file;
- int found_theme = FALSE;
+ gboolean have_iter, found_theme = FALSE;
+ GtkTreeIter iter;
+ GtkTreeModel *model;
dir = g_dir_open(g_path_dir, 0, NULL);
if (dir == NULL) return;
if (pt1) {
found_theme = TRUE;
name = g_build_filename (g_path_dir, file, NULL);
- custom_list_append(name);
+ custom_list_append(name);
g_free(name);
}
}
// 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);
+ custom_list_append(name);
g_free(name);
}
// search default theme
- GtkTreeIter iter;
- GtkTreeModel *model;
- if (g_default_theme != NULL) {
- printf("loadTheme : defaultTheme %s\n", g_default_theme);
- //gtk_tree_selection_select_iter(GtkTreeSelection *selection, GtkTreeIter *iter);
+ found_theme = FALSE;
+ 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);
+ }
+
+ // select theme
+ GtkTreePath *path = NULL;
+ if (found_theme)
+ path = gtk_tree_model_get_path(model, &iter);
+ else {
+ have_iter = gtk_tree_model_get_iter_first(model, &iter);
+ if (have_iter)
+ path = gtk_tree_model_get_path(model, &iter);
+ }
+ if (path) {
+ 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);
}
+
}
g_default_theme = NULL;
}
- g_width = 600;
+ g_width = 500;
g_height = 350;
path = g_build_filename (g_get_user_config_dir(), "tint2", "tint2confrc", NULL);
if (g_file_test (path, G_FILE_TEST_EXISTS)) {
}
}
g_free(path);
- if (g_default_theme != NULL)
- printf("readConfig : defaultTheme %s\n", g_default_theme);
}
{
char *path;
FILE *fp;
- GtkRequisition req;
- int x, y, width, height, depth;
- int top, bottom, left, right;
- GdkRectangle rect;
-
- gtk_window_get_size(GTK_WINDOW(g_window), &width, &height);
- printf("write_config %d, %d\n", width, height);
-
- // GTK incapacity to return (width, height) of the window is really annoying
- gdk_window_get_geometry(GTK_WIDGET(g_window)->window, &x, &y, &width, &height, &depth);
- printf(" write_config %d, %d, %d, %d\n", x, y, width, height);
-
- //Window xid = GDK_WINDOW_XWINDOW(GTK_WIDGET(g_window)->window);
- //gdk_window_get_frame_extentsGTK_WINDOW(g_window), &rect);
- //printf(" write_config %d, %d\n", rec.width, rec.height);
-
-/*
- path = gtk_tree_path_new_from_indices( playlist_pos, -1 );
- sel = gtk_tree_view_get_selection( (GtkTreeView*)list_view );
- gtk_tree_selection_select_path( sel, path );
- gtk_tree_path_free( path );
- */
+
path = g_build_filename (g_get_user_config_dir(), "tint2", "tint2confrc", NULL);
fp = fopen(path, "w");
if (fp != NULL) {
projects / chaz / tint2 / blobdiff