[Xfce4-commits] r23852 - in xarchiver/branches/xarchiver-psybsd: . po src
Stephan Arts
stephan at xfce.org
Mon Nov 13 14:53:59 CET 2006
Author: stephan
Date: 2006-11-13 13:53:56 +0000 (Mon, 13 Nov 2006)
New Revision: 23852
Modified:
xarchiver/branches/xarchiver-psybsd/TODO
xarchiver/branches/xarchiver-psybsd/po/nl.po
xarchiver/branches/xarchiver-psybsd/po/xarchiver.pot
xarchiver/branches/xarchiver-psybsd/src/main.c
xarchiver/branches/xarchiver-psybsd/src/main_window.c
xarchiver/branches/xarchiver-psybsd/src/main_window.h
xarchiver/branches/xarchiver-psybsd/src/notebook.c
xarchiver/branches/xarchiver-psybsd/src/notebook.h
Log:
Fixed stuff
Modified: xarchiver/branches/xarchiver-psybsd/TODO
===================================================================
--- xarchiver/branches/xarchiver-psybsd/TODO 2006-11-13 10:17:01 UTC (rev 23851)
+++ xarchiver/branches/xarchiver-psybsd/TODO 2006-11-13 13:53:56 UTC (rev 23852)
@@ -14,6 +14,8 @@
Fix Command-line options - DONE
+ Add Accelerators to Notebook
+
Add Dialog
New Dialog
Modified: xarchiver/branches/xarchiver-psybsd/po/nl.po
===================================================================
--- xarchiver/branches/xarchiver-psybsd/po/nl.po 2006-11-13 10:17:01 UTC (rev 23851)
+++ xarchiver/branches/xarchiver-psybsd/po/nl.po 2006-11-13 13:53:56 UTC (rev 23852)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: xarchiver 0.3.9psybsd\n"
"Report-Msgid-Bugs-To: psybsd at gmail.com\n"
-"POT-Creation-Date: 2006-11-11 15:09+0100\n"
+"POT-Creation-Date: 2006-11-13 10:55+0100\n"
"PO-Revision-Date: 2006-07-20 16:36+0200\n"
"Last-Translator: Stephan Arts <psybsd at gmail.com>\n"
"Language-Team: Dutch <vertaling at vrijschrift.org>\n"
@@ -44,15 +44,15 @@
#: ../libxarchiver/archive-support-gnu-tar.c:178
msgid "Keep newer files"
-msgstr ""
+msgstr "Bewaar nieuwere bestanden"
#: ../libxarchiver/archive-support-gnu-tar.c:179
msgid "Do not overwrite files newer then those in the archive"
-msgstr ""
+msgstr "Overschrijf geen bestanden die nieuwer zijn dan die in het archief"
#: ../libxarchiver/archive-support-gnu-tar.c:185
msgid "Override permissions"
-msgstr ""
+msgstr "Overschrijf rechten"
#: ../libxarchiver/archive-support-gnu-tar.c:192
#: ../libxarchiver/archive-support-gnu-tar.c:478
@@ -126,11 +126,11 @@
msgid "Version information"
msgstr "Versie informatie"
-#: ../src/main.c:118
+#: ../src/main.c:117
msgid "[archive name]"
msgstr "[archief naam]"
-#: ../src/main.c:122
+#: ../src/main.c:121
#, c-format
msgid ""
"%s: %s\n"
@@ -141,41 +141,82 @@
"opties.\n"
#. File menu
-#: ../src/main_window.c:178
+#: ../src/main_window.c:185
msgid "_File"
msgstr "_Bestand"
#. Action menu
-#: ../src/main_window.c:181
+#: ../src/main_window.c:216
msgid "_Action"
msgstr "_Actie"
+#: ../src/main_window.c:221
+msgid "_Add"
+msgstr "_Toevoegen"
+
+#: ../src/main_window.c:226
+msgid "_Extract"
+msgstr "_Uitpakken"
+
#. View menu
-#: ../src/main_window.c:184
+#: ../src/main_window.c:234
msgid "_View"
msgstr "B_eeld"
-#: ../src/main_window.c:208
+#: ../src/main_window.c:238
+msgid "_Location Selector"
+msgstr "_Locatie Selecteerder"
+
+#: ../src/main_window.c:243
+msgid "Internal style"
+msgstr "Interne stijl"
+
+#: ../src/main_window.c:247
+msgid "Toolbar style"
+msgstr "Toolbar stijl"
+
+#: ../src/main_window.c:251
+msgid "Pathbar style"
+msgstr "Padbar stijl"
+
+#: ../src/main_window.c:277
msgid "Add"
msgstr "Toevoegen"
-#: ../src/main_window.c:212 ../src/extract_dialog.c:102
+#: ../src/main_window.c:281 ../src/extract_dialog.c:102
msgid "Extract"
msgstr "Uitpakken"
-#: ../src/main_window.c:407
+#: ../src/main_window.c:476
msgid "Open archive"
msgstr "Archief openen"
+#: ../src/main_window.c:646
+msgid "Failed to open file"
+msgstr "Het openen van een bestand is mislukt"
+
+#: ../src/main_window.c:647
+#, c-format
+msgid ""
+"'%s'\n"
+"Could not be opened"
+msgstr ""
+"'%s'\n"
+"Kon niet worden geopend"
+
#: ../src/new_dialog.c:87
msgid "Create new archive"
msgstr "Maak nieuw archief"
+#: ../src/add_dialog.c:67
+msgid "Files and directories to add"
+msgstr ""
+
#: ../src/add_dialog.c:68
msgid "Options:"
msgstr "Opties:"
-#: ../src/add_dialog.c:100
+#: ../src/add_dialog.c:97
msgid "Add file(s) to archive"
msgstr "Bestand(en) toevoegen aan archief"
Modified: xarchiver/branches/xarchiver-psybsd/po/xarchiver.pot
===================================================================
--- xarchiver/branches/xarchiver-psybsd/po/xarchiver.pot 2006-11-13 10:17:01 UTC (rev 23851)
+++ xarchiver/branches/xarchiver-psybsd/po/xarchiver.pot 2006-11-13 13:53:56 UTC (rev 23852)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: psybsd at gmail.com\n"
-"POT-Creation-Date: 2006-11-07 11:17+0100\n"
+"POT-Creation-Date: 2006-11-13 10:55+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -24,35 +24,63 @@
msgid "Mime type"
msgstr ""
-#: ../libxarchiver/archive-support-gnu-tar.c:153
+#: ../libxarchiver/archive-support-gnu-tar.c:155
#: ../libxarchiver/archive-support-zip.c:118
msgid "Overwrite existing files"
msgstr ""
-#: ../libxarchiver/archive-support-gnu-tar.c:154
+#: ../libxarchiver/archive-support-gnu-tar.c:156
#: ../libxarchiver/archive-support-zip.c:119
msgid "Overwrite existing files on extraction"
msgstr ""
-#: ../libxarchiver/archive-support-gnu-tar.c:433
+#: ../libxarchiver/archive-support-gnu-tar.c:162
+msgid "Touch files"
+msgstr ""
+
+#: ../libxarchiver/archive-support-gnu-tar.c:169
+msgid "Strip directories"
+msgstr ""
+
+#: ../libxarchiver/archive-support-gnu-tar.c:178
+msgid "Keep newer files"
+msgstr ""
+
+#: ../libxarchiver/archive-support-gnu-tar.c:179
+msgid "Do not overwrite files newer then those in the archive"
+msgstr ""
+
+#: ../libxarchiver/archive-support-gnu-tar.c:185
+msgid "Override permissions"
+msgstr ""
+
+#: ../libxarchiver/archive-support-gnu-tar.c:192
+#: ../libxarchiver/archive-support-gnu-tar.c:478
+msgid "Filesize"
+msgstr ""
+
+#: ../libxarchiver/archive-support-gnu-tar.c:193
+msgid "View filesize"
+msgstr ""
+
+#: ../libxarchiver/archive-support-gnu-tar.c:199
+#: ../libxarchiver/archive-support-gnu-tar.c:470
msgid "Permissions"
msgstr ""
-#: ../libxarchiver/archive-support-gnu-tar.c:437
+#: ../libxarchiver/archive-support-gnu-tar.c:206
+#: ../libxarchiver/archive-support-gnu-tar.c:474
msgid "Owner/Group"
msgstr ""
-#: ../libxarchiver/archive-support-gnu-tar.c:441
-#: ../libxarchiver/archive-support-zip.c:305
-msgid "Size"
-msgstr ""
-
-#: ../libxarchiver/archive-support-gnu-tar.c:445
+#: ../libxarchiver/archive-support-gnu-tar.c:213
+#: ../libxarchiver/archive-support-gnu-tar.c:482
#: ../libxarchiver/archive-support-zip.c:313
msgid "Date"
msgstr ""
-#: ../libxarchiver/archive-support-gnu-tar.c:449
+#: ../libxarchiver/archive-support-gnu-tar.c:220
+#: ../libxarchiver/archive-support-gnu-tar.c:486
#: ../libxarchiver/archive-support-zip.c:317
msgid "Time"
msgstr ""
@@ -70,6 +98,10 @@
msgid "Method"
msgstr ""
+#: ../libxarchiver/archive-support-zip.c:305
+msgid "Size"
+msgstr ""
+
#: ../libxarchiver/archive-support-zip.c:309
msgid "Ratio"
msgstr ""
@@ -94,57 +126,111 @@
msgid "Version information"
msgstr ""
-#: ../src/main.c:118
+#: ../src/main.c:117
msgid "[archive name]"
msgstr ""
-#: ../src/main.c:122
+#: ../src/main.c:121
#, c-format
msgid ""
"%s: %s\n"
"Try xarchiver --help to see a full list of available command line options.\n"
msgstr ""
-#: ../src/main_window.c:194
+#. File menu
+#: ../src/main_window.c:185
+msgid "_File"
+msgstr ""
+
+#. Action menu
+#: ../src/main_window.c:216
+msgid "_Action"
+msgstr ""
+
+#: ../src/main_window.c:221
+msgid "_Add"
+msgstr ""
+
+#: ../src/main_window.c:226
+msgid "_Extract"
+msgstr ""
+
+#. View menu
+#: ../src/main_window.c:234
+msgid "_View"
+msgstr ""
+
+#: ../src/main_window.c:238
+msgid "_Location Selector"
+msgstr ""
+
+#: ../src/main_window.c:243
+msgid "Internal style"
+msgstr ""
+
+#: ../src/main_window.c:247
+msgid "Toolbar style"
+msgstr ""
+
+#: ../src/main_window.c:251
+msgid "Pathbar style"
+msgstr ""
+
+#: ../src/main_window.c:277
msgid "Add"
msgstr ""
-#: ../src/main_window.c:198 ../src/extract_dialog.c:101
+#: ../src/main_window.c:281 ../src/extract_dialog.c:102
msgid "Extract"
msgstr ""
-#: ../src/main_window.c:393
+#: ../src/main_window.c:476
msgid "Open archive"
msgstr ""
+#: ../src/main_window.c:646
+msgid "Failed to open file"
+msgstr ""
+
+#: ../src/main_window.c:647
+#, c-format
+msgid ""
+"'%s'\n"
+"Could not be opened"
+msgstr ""
+
#: ../src/new_dialog.c:87
msgid "Create new archive"
msgstr ""
-#: ../src/add_dialog.c:66
-msgid "Drag Files and folders to bottom list"
+#: ../src/add_dialog.c:67
+msgid "Files and directories to add"
msgstr ""
-#: ../src/add_dialog.c:93
+#: ../src/add_dialog.c:68
+msgid "Options:"
+msgstr ""
+
+#: ../src/add_dialog.c:97
msgid "Add file(s) to archive"
msgstr ""
-#: ../src/extract_dialog.c:77
+#: ../src/extract_dialog.c:78
msgid "<b>Extract files:</b>"
msgstr ""
-#: ../src/extract_dialog.c:78
+#: ../src/extract_dialog.c:79
msgid "<b>Options:</b>"
msgstr ""
-#: ../src/extract_dialog.c:88
+#: ../src/extract_dialog.c:89
msgid "All files"
msgstr ""
-#: ../src/extract_dialog.c:89
+#: ../src/extract_dialog.c:90
msgid "Selected files"
msgstr ""
-#: ../src/extract_dialog.c:113
+#: ../src/extract_dialog.c:115
msgid "Extract archive"
msgstr ""
Modified: xarchiver/branches/xarchiver-psybsd/src/main.c
===================================================================
--- xarchiver/branches/xarchiver-psybsd/src/main.c 2006-11-13 10:17:01 UTC (rev 23851)
+++ xarchiver/branches/xarchiver-psybsd/src/main.c 2006-11-13 13:53:56 UTC (rev 23852)
@@ -112,7 +112,6 @@
#ifdef G_THREADS_ENABLED
g_thread_init(NULL);
- gdk_threads_init();
#endif /* G_THREADS_ENABLED */
if(!gtk_init_with_args(&argc, &argv, _("[archive name]"), entries, PACKAGE, &cli_error))
Modified: xarchiver/branches/xarchiver-psybsd/src/main_window.c
===================================================================
--- xarchiver/branches/xarchiver-psybsd/src/main_window.c 2006-11-13 10:17:01 UTC (rev 23851)
+++ xarchiver/branches/xarchiver-psybsd/src/main_window.c 2006-11-13 13:53:56 UTC (rev 23852)
@@ -196,6 +196,8 @@
window->menubar.menu_item_properties = gtk_image_menu_item_new_from_stock(GTK_STOCK_PROPERTIES, window->accel_group);
gtk_container_add(GTK_CONTAINER(window->menubar.menu_file), window->menubar.menu_item_properties);
+ gtk_widget_set_sensitive(window->menubar.menu_item_properties, FALSE);
+
window->menubar.menu_item_close = gtk_image_menu_item_new_from_stock(GTK_STOCK_CLOSE, window->accel_group);
gtk_container_add(GTK_CONTAINER(window->menubar.menu_file), window->menubar.menu_item_close);
gtk_widget_set_sensitive(window->menubar.menu_item_close, FALSE);
@@ -212,11 +214,51 @@
g_signal_connect(G_OBJECT(window->menubar.menu_item_quit), "activate", G_CALLBACK(cb_xa_main_close_window), window);
/* Action menu */
window->menubar.menu_item_action = gtk_menu_item_new_with_mnemonic(_("_Action"));
+ window->menubar.menu_action = gtk_menu_new();
+ gtk_menu_item_set_submenu(GTK_MENU_ITEM(window->menubar.menu_item_action), window->menubar.menu_action);
+ tmp_image = xa_main_window_find_image("add.png", GTK_ICON_SIZE_MENU);
+ window->menubar.menu_item_add = gtk_image_menu_item_new_with_mnemonic(_("_Add"));
+ gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(window->menubar.menu_item_add), tmp_image);
+ gtk_widget_set_sensitive(window->menubar.menu_item_add, FALSE);
+ gtk_container_add(GTK_CONTAINER(window->menubar.menu_action), window->menubar.menu_item_add);
+
+ tmp_image = xa_main_window_find_image("extract.png", GTK_ICON_SIZE_MENU);
+ window->menubar.menu_item_extract = gtk_image_menu_item_new_with_mnemonic(_("_Extract"));
+ gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(window->menubar.menu_item_extract), tmp_image);
+ gtk_widget_set_sensitive(window->menubar.menu_item_extract, FALSE);
+ gtk_container_add(GTK_CONTAINER(window->menubar.menu_action), window->menubar.menu_item_extract);
+
+ window->menubar.menu_item_remove = gtk_image_menu_item_new_from_stock(GTK_STOCK_DELETE, window->accel_group);
+ gtk_widget_set_sensitive(window->menubar.menu_item_remove, FALSE);
+ gtk_container_add(GTK_CONTAINER(window->menubar.menu_action), window->menubar.menu_item_remove);
+
+ g_signal_connect(G_OBJECT(window->menubar.menu_item_add), "activate", G_CALLBACK(cb_xa_main_add_to_archive), window);
+ g_signal_connect(G_OBJECT(window->menubar.menu_item_extract), "activate", G_CALLBACK(cb_xa_main_extract_archive), window);
+
/* View menu */
window->menubar.menu_item_view = gtk_menu_item_new_with_mnemonic(_("_View"));
+ window->menubar.menu_view = gtk_menu_new();
+ gtk_menu_item_set_submenu(GTK_MENU_ITEM(window->menubar.menu_item_view), window->menubar.menu_view);
+ window->menubar.menu_item_nav_bar = gtk_menu_item_new_with_mnemonic(_("_Location Selector"));
+ window->menubar.menu_nav_bar = gtk_menu_new();
+ gtk_menu_item_set_submenu(GTK_MENU_ITEM(window->menubar.menu_item_nav_bar), window->menubar.menu_nav_bar);
+ gtk_container_add(GTK_CONTAINER(window->menubar.menu_view), window->menubar.menu_item_nav_bar);
+ window->menubar.menu_item_no_bar = gtk_radio_menu_item_new_with_mnemonic(NULL, _("Internal style"));
+ gtk_container_add(GTK_CONTAINER(window->menubar.menu_nav_bar), window->menubar.menu_item_no_bar);
+ gtk_check_menu_item_set_active((GtkCheckMenuItem *)window->menubar.menu_item_no_bar, TRUE);
+#ifdef ENABLE_TOOLBAR
+ window->menubar.menu_item_tool_bar = gtk_radio_menu_item_new_with_mnemonic_from_widget(GTK_RADIO_MENU_ITEM(window->menubar.menu_item_no_bar), _("Toolbar style"));
+ gtk_container_add(GTK_CONTAINER(window->menubar.menu_nav_bar), window->menubar.menu_item_tool_bar);
+#endif /* ENABLE_TOOLBAR */
+#ifdef ENABLE_PATHBAR
+ window->menubar.menu_item_path_bar = gtk_radio_menu_item_new_with_mnemonic_from_widget(GTK_RADIO_MENU_ITEM(window->menubar.menu_item_no_bar), _("Pathbar style"));
+ gtk_container_add(GTK_CONTAINER(window->menubar.menu_nav_bar), window->menubar.menu_item_path_bar);
+#endif /* ENABLE_PATHBAR */
+
+
gtk_menu_bar_append(GTK_MENU_BAR(window->menu_bar), window->menubar.menu_item_file);
gtk_menu_bar_append(GTK_MENU_BAR(window->menu_bar), window->menubar.menu_item_action);
gtk_menu_bar_append(GTK_MENU_BAR(window->menu_bar), window->menubar.menu_item_view);
@@ -289,6 +331,7 @@
if(!window->navigationbar)
{
window->navigationbar = xa_navigation_bar_new(NULL);
+ up_dir = TRUE;
}
show_icons = xa_settings_read_bool_entry(window->settings, "ShowIcons", TRUE);
@@ -299,7 +342,7 @@
gtk_widget_ref(GTK_WIDGET(window->navigationbar));
/* main view */
- window->notebook = xa_notebook_new(window->navigationbar, use_tabs);
+ window->notebook = xa_notebook_new(window->navigationbar, use_tabs, window->accel_group);
g_signal_connect(G_OBJECT(window->notebook), "switch-page", G_CALLBACK(cb_xa_main_window_notebook_page_switched), window);
g_signal_connect(G_OBJECT(window->notebook), "archive-removed", G_CALLBACK(cb_xa_main_window_notebook_page_removed), window);
/* Statusbar */
@@ -536,8 +579,8 @@
static void
cb_xa_main_close_archive(GtkWidget *widget, gpointer userdata)
{
- //XAMainWindow *window = XA_MAIN_WINDOW(userdata);
- g_debug("Closing archive");
+ XAMainWindow *window = XA_MAIN_WINDOW(userdata);
+ xa_notebook_close_active_archive(XA_NOTEBOOK(window->notebook));
}
static void
@@ -558,6 +601,10 @@
LXAArchive *lp_archive;
XAMainWindow *window = XA_MAIN_WINDOW(data);
+ gtk_widget_set_sensitive(GTK_WIDGET(window->menubar.menu_item_add), TRUE);
+ gtk_widget_set_sensitive(GTK_WIDGET(window->menubar.menu_item_extract), TRUE);
+ gtk_widget_set_sensitive(GTK_WIDGET(window->menubar.menu_item_remove), TRUE);
+
gtk_widget_set_sensitive(GTK_WIDGET(window->toolbar.tool_item_add), TRUE);
gtk_widget_set_sensitive(GTK_WIDGET(window->toolbar.tool_item_extract), TRUE);
gtk_widget_set_sensitive(GTK_WIDGET(window->toolbar.tool_item_remove), TRUE);
@@ -576,6 +623,12 @@
if(!gtk_notebook_get_n_pages(GTK_NOTEBOOK(notebook)))
{
gtk_widget_set_sensitive(window->menubar.menu_item_close, FALSE);
+ gtk_widget_set_sensitive(window->menubar.menu_item_properties, FALSE);
+
+ gtk_widget_set_sensitive(window->menubar.menu_item_add, FALSE);
+ gtk_widget_set_sensitive(window->menubar.menu_item_extract, FALSE);
+ gtk_widget_set_sensitive(window->menubar.menu_item_remove, FALSE);
+
gtk_widget_set_sensitive(GTK_WIDGET(window->toolbar.tool_item_add), FALSE);
gtk_widget_set_sensitive(GTK_WIDGET(window->toolbar.tool_item_extract), FALSE);
gtk_widget_set_sensitive(GTK_WIDGET(window->toolbar.tool_item_remove), FALSE);
@@ -597,6 +650,7 @@
else
xa_notebook_page_set_archive(XA_NOTEBOOK(window->notebook), archive, support, replace);
gtk_widget_set_sensitive(window->menubar.menu_item_close, TRUE);
+ gtk_widget_set_sensitive(window->menubar.menu_item_properties, TRUE);
return 0;
}
else
Modified: xarchiver/branches/xarchiver-psybsd/src/main_window.h
===================================================================
--- xarchiver/branches/xarchiver-psybsd/src/main_window.h 2006-11-13 10:17:01 UTC (rev 23851)
+++ xarchiver/branches/xarchiver-psybsd/src/main_window.h 2006-11-13 13:53:56 UTC (rev 23852)
@@ -60,33 +60,42 @@
GtkWidget *menu_item_file;
GtkWidget *menu_file;
/* contents of 'file' menu */
- GtkWidget *menu_item_new;
- GtkWidget *menu_item_open;
- GtkWidget *menu_item_properties;
- GtkWidget *menu_item_close;
- GtkWidget *menu_item_quit;
+ GtkWidget *menu_item_new;
+ GtkWidget *menu_item_open;
+ GtkWidget *menu_item_properties;
+ GtkWidget *menu_item_close;
+ GtkWidget *menu_item_quit;
+ /***************************/
/* 'action' menu */
GtkWidget *menu_item_action;
GtkWidget *menu_action;
/* contents of 'action' menu */
- GtkWidget *menu_item_add;
- GtkWidget *menu_item_extract;
- GtkWidget *menu_item_remove;
+ GtkWidget *menu_item_add;
+ GtkWidget *menu_item_extract;
+ GtkWidget *menu_item_remove;
+ /***************************/
/* 'view' menu */
GtkWidget *menu_item_view;
GtkWidget *menu_view;
/* contents of 'view' menu */
- GtkWidget *menu_location_selector;
- GtkWidget *menu_item_settings;
+ GtkWidget *menu_item_nav_bar;
+ GtkWidget *menu_nav_bar;
+ /* contents of 'nav_bar' submenu */
+ GtkWidget *menu_item_tool_bar;
+ GtkWidget *menu_item_path_bar;
+ GtkWidget *menu_item_no_bar;
+ /*********************************/
+ GtkWidget *menu_item_settings;
+ /***************************/
/* 'help' menu */
GtkWidget *menu_item_help;
GtkWidget *menu_help;
/* contents of 'help' menu */
- GtkWidget *menu_item_about;
+ GtkWidget *menu_item_about;
} menubar;
struct {
Modified: xarchiver/branches/xarchiver-psybsd/src/notebook.c
===================================================================
--- xarchiver/branches/xarchiver-psybsd/src/notebook.c 2006-11-13 10:17:01 UTC (rev 23851)
+++ xarchiver/branches/xarchiver-psybsd/src/notebook.c 2006-11-13 13:53:56 UTC (rev 23852)
@@ -43,7 +43,7 @@
static void
xa_notebook_treeview_reset_columns(LXAArchive *archive, GtkTreeView *treeview);
-void
+static void
cb_notebook_close_archive(GtkButton *button, GtkWidget *child);
void
@@ -59,7 +59,7 @@
XA_NOTEBOOK_MULTI_TAB = 1
};
-static gint xa_notebook_signals[2];
+static gint xa_notebook_signals[4];
GType
xa_notebook_get_type ()
@@ -108,6 +108,20 @@
0,
NULL);
+ xa_notebook_signals[1] = g_signal_new("page-up",
+ G_TYPE_FROM_CLASS(notebook_class),
+ G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, 0,
+ NULL, NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0, NULL);
+
+ xa_notebook_signals[2] = g_signal_new("page-down",
+ G_TYPE_FROM_CLASS(notebook_class),
+ G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, 0,
+ NULL, NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0, NULL);
+
pspec = g_param_spec_boolean("multi_tab",
"",
"",
@@ -122,6 +136,10 @@
{
g_signal_connect(G_OBJECT(notebook), "switch-page", G_CALLBACK(cb_xa_notebook_page_switched), NULL);
g_signal_connect(G_OBJECT(notebook), "archive-removed", G_CALLBACK(cb_xa_notebook_page_removed), NULL);
+
+ g_signal_connect(G_OBJECT(notebook), "page-up", G_CALLBACK(gtk_notebook_next_page), NULL);
+ g_signal_connect(G_OBJECT(notebook), "page-down", G_CALLBACK(gtk_notebook_prev_page), NULL);
+
notebook->tool_tips = gtk_tooltips_new();
gtk_tooltips_enable(notebook->tool_tips);
gtk_notebook_set_tab_border(GTK_NOTEBOOK(notebook), 0);
@@ -135,7 +153,7 @@
}
GtkWidget *
-xa_notebook_new(XANavigationBar *bar, gboolean use_tabs)
+xa_notebook_new(XANavigationBar *bar, gboolean use_tabs, GtkAccelGroup *accel_group)
{
XANotebook *notebook;
@@ -145,13 +163,23 @@
if(bar)
{
xa_notebook_set_navigation_bar(notebook, bar);
- if(XA_IS_TOOL_BAR(bar) || XA_IS_PATH_BAR(bar))
+#ifdef ENABLE_TOOLBAR
+ if(XA_IS_TOOL_BAR(bar))
notebook->props._up_dir = FALSE;
+#endif
+#ifdef ENABLE_PATHBAR
+ if(XA_IS_PATH_BAR(bar))
+ notebook->props._up_dir = FALSE;
+#endif
}
notebook->props._show_icons = TRUE;
notebook->multi_tab = use_tabs;
+ notebook->accel_group = accel_group;
+ gtk_widget_add_accelerator(GTK_WIDGET(notebook), "page-up", accel_group, 0xff55, GDK_CONTROL_MASK, 0);
+ gtk_widget_add_accelerator(GTK_WIDGET(notebook), "page-down", accel_group, 0xff56, GDK_CONTROL_MASK, 0);
+
return (GtkWidget *)notebook;
}
@@ -246,7 +274,7 @@
{
}
-void
+static void
cb_notebook_close_archive(GtkButton *button, GtkWidget *child)
{
GtkNotebook *notebook = GTK_NOTEBOOK(gtk_widget_get_parent(child));
@@ -257,6 +285,15 @@
}
void
+xa_notebook_close_active_archive(XANotebook *notebook)
+{
+ GtkNotebook *_notebook = GTK_NOTEBOOK(notebook);
+ gint n = gtk_notebook_get_current_page(_notebook);
+ gtk_notebook_remove_page(_notebook, n);
+ g_signal_emit(G_OBJECT(notebook), xa_notebook_signals[0], 0, notebook);
+}
+
+void
cb_notebook_archive_refreshed(LXAArchive *archive, GtkTreeView *treeview)
{
xa_notebook_treeview_reset_columns(archive, treeview);
@@ -351,6 +388,7 @@
xa_navigation_bar_set_store(notebook->navigation_bar, NULL);
}
+
void
xa_notebook_get_active_archive(XANotebook *notebook, LXAArchive **lp_archive, LXAArchiveSupport **lp_support)
{
Modified: xarchiver/branches/xarchiver-psybsd/src/notebook.h
===================================================================
--- xarchiver/branches/xarchiver-psybsd/src/notebook.h 2006-11-13 10:17:01 UTC (rev 23851)
+++ xarchiver/branches/xarchiver-psybsd/src/notebook.h 2006-11-13 13:53:56 UTC (rev 23852)
@@ -53,6 +53,7 @@
gboolean _up_dir;
} props;
GtkIconTheme *icon_theme;
+ GtkAccelGroup *accel_group;
GtkTooltips *tool_tips;
};
@@ -63,7 +64,7 @@
GtkNotebookClass parent;
};
-GtkWidget *xa_notebook_new (XANavigationBar *bar, gboolean use_tabs);
+GtkWidget *xa_notebook_new (XANavigationBar *, gboolean , GtkAccelGroup *);
GType xa_notebook_get_type ();
void xa_notebook_set_navigation_bar(XANotebook *, XANavigationBar *);
@@ -74,6 +75,7 @@
void xa_notebook_get_active_archive(XANotebook *, LXAArchive **, LXAArchiveSupport **);
GtkWidget * xa_notebook_get_active_child(XANotebook *notebook);
gboolean xa_notebook_get_multi_tab(XANotebook *notebook);
+void xa_notebook_close_active_archive(XANotebook *);
G_END_DECLS
#endif /* __XARCHIVER_NOTEBOOK_H__ */
More information about the Xfce4-commits
mailing list