[Xfce4-commits] r23212 - xarchiver/branches/xarchiver-psybsd/src
Author: stephan
Date: 2006-09-26 12:46:32 + (Tue, 26 Sep 2006)
New Revision: 23212
Modified:
xarchiver/branches/xarchiver-psybsd/src/main_window.c
Log:
Fixed icon-theme-change stuff. (really)
Modified: xarchiver/branches/xarchiver-psybsd/src/main_window.c
===
--- xarchiver/branches/xarchiver-psybsd/src/main_window.c 2006-09-26
11:05:02 UTC (rev 23211)
+++ xarchiver/branches/xarchiver-psybsd/src/main_window.c 2006-09-26
12:46:32 UTC (rev 23212)
@@ -770,12 +770,8 @@
if(props)
{
props_iter = props;
- if(main_window-props._show_icons)
- column_number = archive-column_number;
- else
- column_number = archive-column_number - 1;
- for(; i column_number; i++)
+ for(i=1; i archive-column_number; i++)
{
tmp_value = g_new0(GValue, 1);
tmp_value = g_value_init(tmp_value,
archive-column_types[i]);
@@ -794,7 +790,10 @@
props_iter += sizeof(guint64);
break;
}
-
gtk_list_store_set_value(GTK_LIST_STORE(liststore), iter, i+1, tmp_value);
+ if(main_window-props._show_icons)
+
gtk_list_store_set_value(GTK_LIST_STORE(liststore), iter, i+1, tmp_value);
+ else
+
gtk_list_store_set_value(GTK_LIST_STORE(liststore), iter, i, tmp_value);
g_free(tmp_value);
}
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r23213 - libfrap/trunk/libfrap/menu
Author: jannis
Date: 2006-09-26 15:28:07 + (Tue, 26 Sep 2006)
New Revision: 23213
Added:
libfrap/trunk/libfrap/menu/frap-menu-or-rules.c
libfrap/trunk/libfrap/menu/frap-menu-or-rules.h
libfrap/trunk/libfrap/menu/frap-menu-rules.c
libfrap/trunk/libfrap/menu/frap-menu-rules.h
libfrap/trunk/libfrap/menu/frap-menu-standard-rules.c
libfrap/trunk/libfrap/menu/frap-menu-standard-rules.h
Modified:
libfrap/trunk/libfrap/menu/ChangeLog
libfrap/trunk/libfrap/menu/Makefile.am
libfrap/trunk/libfrap/menu/frap-menu.c
Log:
* Makefile.am, frap-menu-rules.{c.h}: FrapMenuRulesIface interface
added.
This interface will be used for the And, Or and Not elements.
It provides virtual methods to add filename and category rules as
well as FrapMenuRules objects (as the mentioned elements may be
nested). It also provides a virtual method for matching menu items
(essentially, desktop entries) against these rules.
* Makefile.am, frap-menu-standard-rules.{c,h}: Implemented a base
class for all rule sets (And, Or, Not). It implements the add
methods of FrapMenuRulesIface. The responsibility of implementing the
match method is forwarded to subclasses of FrapMenuStandardRules.
* Makefile.am, frap-menu-or-rules.{c,h}: This first implementation of
the FrapMenuRulesIface will be used for matching items against Or,
Include and Exclude elements. The match method is not implemented
yet, though.
Modified: libfrap/trunk/libfrap/menu/ChangeLog
===
--- libfrap/trunk/libfrap/menu/ChangeLog2006-09-26 12:46:32 UTC (rev
23212)
+++ libfrap/trunk/libfrap/menu/ChangeLog2006-09-26 15:28:07 UTC (rev
23213)
@@ -1,3 +1,20 @@
+2006-09-26 Jannis Pohlmann [EMAIL PROTECTED]
+
+ * Makefile.am, frap-menu-rules.{c.h}: FrapMenuRulesIface interface
added.
+ This interface will be used for the And, Or and Not elements.
+ It provides virtual methods to add filename and category rules as
+ well as FrapMenuRules objects (as the mentioned elements may be
+ nested). It also provides a virtual method for matching menu items
+ (essentially, desktop entries) against these rules.
+ * Makefile.am, frap-menu-standard-rules.{c,h}: Implemented a base
+ class for all rule sets (And, Or, Not). It implements the add
+ methods of FrapMenuRulesIface. The responsibility of implementing the
+ match method is forwarded to subclasses of FrapMenuStandardRules.
+ * Makefile.am, frap-menu-or-rules.{c,h}: This first implementation of
+ the FrapMenuRulesIface will be used for matching items against Or,
+ Include and Exclude elements. The match method is not implemented
+ yet, though.
+
2006-07-28 Jannis Pohlmann [EMAIL PROTECTED]
* Import as libfrapmenu into the newly created libfrap development
Modified: libfrap/trunk/libfrap/menu/Makefile.am
===
--- libfrap/trunk/libfrap/menu/Makefile.am 2006-09-26 12:46:32 UTC (rev
23212)
+++ libfrap/trunk/libfrap/menu/Makefile.am 2006-09-26 15:28:07 UTC (rev
23213)
@@ -4,12 +4,18 @@
libfrapmenu_la_SOURCES = \
frap-menu.c \
- frap-menu-directory.c
+ frap-menu-directory.c \
+ frap-menu-rules.c \
+ frap-menu-standard-rules.c \
+ frap-menu-or-rules.c
noinst_HEADERS = \
libfrapmenu.h \
frap-menu.h \
- frap-menu-directory.h
+ frap-menu-directory.h \
+ frap-menu-rules.h \
+ frap-menu-standard-rules.h \
+ frap-menu-or-rules.h
INCLUDES = \
$(GLIB_CFLAGS) \
Added: libfrap/trunk/libfrap/menu/frap-menu-or-rules.c
===
--- libfrap/trunk/libfrap/menu/frap-menu-or-rules.c
(rev 0)
+++ libfrap/trunk/libfrap/menu/frap-menu-or-rules.c 2006-09-26 15:28:07 UTC
(rev 23213)
@@ -0,0 +1,124 @@
+/* $Id$ */
+/* vi:set expandtab sw=2 sts=2: */
+/*-
+ * Copyright (c) 2006 Jannis Pohlmann [EMAIL PROTECTED]
+ *
+ * This
[Xfce4-commits] r23211 - xarchiver/branches/xarchiver-psybsd/src
Author: stephan
Date: 2006-09-26 11:05:02 + (Tue, 26 Sep 2006)
New Revision: 23211
Modified:
xarchiver/branches/xarchiver-psybsd/src/add_dialog.c
xarchiver/branches/xarchiver-psybsd/src/main_window.c
Log:
Enable search in tree, fix set-style stuff.
Modified: xarchiver/branches/xarchiver-psybsd/src/add_dialog.c
===
--- xarchiver/branches/xarchiver-psybsd/src/add_dialog.c2006-09-25
20:22:37 UTC (rev 23210)
+++ xarchiver/branches/xarchiver-psybsd/src/add_dialog.c2006-09-26
11:05:02 UTC (rev 23211)
@@ -2,8 +2,7 @@
* Copyright (c) 2006 Stephan Arts [EMAIL PROTECTED]
*
* This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * it under the terms of the GNU General Public License as published by *
the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
Modified: xarchiver/branches/xarchiver-psybsd/src/main_window.c
===
--- xarchiver/branches/xarchiver-psybsd/src/main_window.c 2006-09-25
20:22:37 UTC (rev 23210)
+++ xarchiver/branches/xarchiver-psybsd/src/main_window.c 2006-09-26
11:05:02 UTC (rev 23211)
@@ -254,6 +254,8 @@
window-treeview = gtk_tree_view_new();
+ gtk_tree_view_set_enable_search(GTK_TREE_VIEW(window-treeview), TRUE);
+
gtk_container_add(GTK_CONTAINER(window-scrollwindow),
window-treeview);
gtk_widget_show(window-scrollwindow);
@@ -327,7 +329,7 @@
if(window-working_node)
items = ((LXAEntry *)window-working_node-data)-children;
- if(!gtk_icon_theme_has_icon(window-icon_theme, folder))
+ if(!(gtk_icon_theme_has_icon(window-icon_theme, folder)
gtk_icon_theme_has_icon(window-icon_theme, unknown)
gtk_icon_theme_has_icon(window-icon_theme, go-up)))
window-props._show_icons = FALSE;
else
window-props._show_icons = TRUE;
@@ -690,8 +692,8 @@
renderer = gtk_cell_renderer_pixbuf_new();
column = gtk_tree_view_column_new_with_attributes(, renderer,
icon-name, 0, NULL);
- gtk_tree_view_column_set_resizable(column, TRUE);
- gtk_tree_view_column_set_sort_column_id(column, 0);
+ gtk_tree_view_column_set_resizable(column, FALSE);
+ //gtk_tree_view_column_set_sort_column_id(column, 0);
gtk_tree_view_append_column(GTK_TREE_VIEW(window-treeview),
column);
for(x = 0; x archive-column_number; x++)
{
@@ -707,6 +709,7 @@
gtk_tree_view_column_set_sort_column_id(column, x+1);
gtk_tree_view_append_column(GTK_TREE_VIEW(window-treeview), column);
}
+
gtk_tree_view_set_search_column(GTK_TREE_VIEW(window-treeview), 1);
} else
{
liststore = gtk_list_store_newv(archive-column_number,
archive-column_types);
@@ -724,6 +727,7 @@
gtk_tree_view_column_set_sort_column_id(column, x);
gtk_tree_view_append_column(GTK_TREE_VIEW(window-treeview), column);
}
+
gtk_tree_view_set_search_column(GTK_TREE_VIEW(window-treeview), 0);
}
gtk_tree_view_set_model(GTK_TREE_VIEW(window-treeview),
GTK_TREE_MODEL(liststore));
}
@@ -849,7 +853,7 @@
}
else
{
- GtkWidget *dialog =
gtk_message_dialog_new(GTK_WINDOW(main_window), 0, GTK_MESSAGE_WARNING,
GTK_BUTTONS_OK, Viewing of file is not yet implemented);
+ GtkWidget *dialog =
gtk_message_dialog_new(GTK_WINDOW(main_window), 0, GTK_MESSAGE_QUESTION,
GTK_BUTTONS_OK, What do you want to do today?);
gtk_dialog_run(GTK_DIALOG(dialog));
gtk_widget_destroy(dialog);
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r23216 - pyxfce/trunk
Author: dannym Date: 2006-09-26 22:31:01 + (Tue, 26 Sep 2006) New Revision: 23216 Modified: pyxfce/trunk/Makefile.am Log: add panel to dist Modified: pyxfce/trunk/Makefile.am === --- pyxfce/trunk/Makefile.am2006-09-26 22:30:49 UTC (rev 23215) +++ pyxfce/trunk/Makefile.am2006-09-26 22:31:01 UTC (rev 23216) @@ -14,7 +14,7 @@ endif SUBDIRS = gui mcs netk util $(SUBDIR_MIGHTY_MOUSE) -DIST_SUBDIRS = gui mcs netk util +DIST_SUBDIRS = gui mcs netk util $(SUBDIR_MIGHTY_MOUSE) PLATFORM_VERSION = 4.2 PLATFORM_WIN32 = ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
