diff --git a/mousepad-git/.git/HEAD b/mousepad-new/.git/HEAD diff --git a/mousepad-git/.git/config b/mousepad-new/.git/config diff --git a/mousepad-git/.git/description b/mousepad-new/.git/description diff --git a/mousepad-git/.git/hooks/applypatch-msg.sample b/mousepad-new/.git/hooks/applypatch-msg.sample diff --git a/mousepad-git/.git/hooks/commit-msg.sample b/mousepad-new/.git/hooks/commit-msg.sample diff --git a/mousepad-git/.git/hooks/post-commit.sample b/mousepad-new/.git/hooks/post-commit.sample diff --git a/mousepad-git/.git/hooks/post-receive.sample b/mousepad-new/.git/hooks/post-receive.sample diff --git a/mousepad-git/.git/hooks/post-update.sample b/mousepad-new/.git/hooks/post-update.sample diff --git a/mousepad-git/.git/hooks/pre-applypatch.sample b/mousepad-new/.git/hooks/pre-applypatch.sample diff --git a/mousepad-git/.git/hooks/pre-commit.sample b/mousepad-new/.git/hooks/pre-commit.sample diff --git a/mousepad-git/.git/hooks/pre-rebase.sample b/mousepad-new/.git/hooks/pre-rebase.sample diff --git a/mousepad-git/.git/hooks/prepare-commit-msg.sample b/mousepad-new/.git/hooks/prepare-commit-msg.sample diff --git a/mousepad-git/.git/hooks/update.sample b/mousepad-new/.git/hooks/update.sample diff --git a/mousepad-git/.git/index b/mousepad-new/.git/index diff --git a/mousepad-git/.git/info/exclude b/mousepad-new/.git/info/exclude diff --git a/mousepad-git/.git/logs/HEAD b/mousepad-new/.git/logs/HEAD diff --git a/mousepad-git/.git/logs/refs/heads/master b/mousepad-new/.git/logs/refs/heads/master diff --git a/mousepad-git/.git/logs/refs/remotes/origin/HEAD b/mousepad-new/.git/logs/refs/remotes/origin/HEAD diff --git a/mousepad-git/.git/objects/pack/pack-2df3a972815efd35f05228369955d2b37b0f9623.idx b/mousepad-new/.git/objects/pack/pack-2df3a972815efd35f05228369955d2b37b0f9623.idx diff --git a/mousepad-git/.git/objects/pack/pack-2df3a972815efd35f05228369955d2b37b0f9623.pack b/mousepad-new/.git/objects/pack/pack-2df3a972815efd35f05228369955d2b37b0f9623.pack diff --git a/mousepad-git/.git/packed-refs b/mousepad-new/.git/packed-refs diff --git a/mousepad-git/.git/refs/heads/master b/mousepad-new/.git/refs/heads/master diff --git a/mousepad-git/.git/refs/remotes/origin/HEAD b/mousepad-new/.git/refs/remotes/origin/HEAD diff --git a/mousepad-git/AUTHORS b/mousepad-new/AUTHORS diff --git a/mousepad-git/COPYING b/mousepad-new/COPYING diff --git a/mousepad-git/ChangeLog b/mousepad-new/ChangeLog diff --git a/mousepad-git/INSTALL b/mousepad-new/INSTALL diff --git a/mousepad-git/Makefile b/mousepad-new/Makefile diff --git a/mousepad-git/Makefile.am b/mousepad-new/Makefile.am diff --git a/mousepad-git/Makefile.in b/mousepad-new/Makefile.in diff --git a/mousepad-git/Mousepad.desktop b/mousepad-new/Mousepad.desktop diff --git a/mousepad-git/Mousepad.desktop.in.in b/mousepad-new/Mousepad.desktop.in.in diff --git a/mousepad-git/Mousepad.spec.in b/mousepad-new/Mousepad.spec.in diff --git a/mousepad-git/MousepadHelp b/mousepad-new/MousepadHelp diff --git a/mousepad-git/MousepadHelp.in b/mousepad-new/MousepadHelp.in diff --git a/mousepad-git/NEWS b/mousepad-new/NEWS diff --git a/mousepad-git/README b/mousepad-new/README diff --git a/mousepad-git/THANKS b/mousepad-new/THANKS diff --git a/mousepad-git/TODO b/mousepad-new/TODO diff --git a/mousepad-git/aclocal.m4 b/mousepad-new/aclocal.m4 diff --git a/mousepad-git/autogen.sh b/mousepad-new/autogen.sh diff --git a/mousepad-git/autom4te.cache/output.0 b/mousepad-new/autom4te.cache/output.0 diff --git a/mousepad-git/autom4te.cache/output.1 b/mousepad-new/autom4te.cache/output.1 diff --git a/mousepad-git/autom4te.cache/requests b/mousepad-new/autom4te.cache/requests diff --git a/mousepad-git/autom4te.cache/traces.0 b/mousepad-new/autom4te.cache/traces.0 diff --git a/mousepad-git/autom4te.cache/traces.1 b/mousepad-new/autom4te.cache/traces.1 diff --git a/mousepad-git/config.guess b/mousepad-new/config.guess diff --git a/mousepad-git/config.h b/mousepad-new/config.h diff --git a/mousepad-git/config.h.in b/mousepad-new/config.h.in diff --git a/mousepad-git/config.log b/mousepad-new/config.log diff --git a/mousepad-git/config.status b/mousepad-new/config.status diff --git a/mousepad-git/config.sub b/mousepad-new/config.sub diff --git a/mousepad-git/configure b/mousepad-new/configure diff --git a/mousepad-git/configure.in b/mousepad-new/configure.in diff --git a/mousepad-git/configure.in.in b/mousepad-new/configure.in.in diff --git a/mousepad-git/depcomp b/mousepad-new/depcomp diff --git a/mousepad-git/docs/Makefile b/mousepad-new/docs/Makefile diff --git a/mousepad-git/docs/Makefile.am b/mousepad-new/docs/Makefile.am diff --git a/mousepad-git/docs/Makefile.in b/mousepad-new/docs/Makefile.in diff --git a/mousepad-git/docs/manual/C/Makefile b/mousepad-new/docs/manual/C/Makefile diff --git a/mousepad-git/docs/manual/C/Makefile.am b/mousepad-new/docs/manual/C/Makefile.am diff --git a/mousepad-git/docs/manual/C/Makefile.in b/mousepad-new/docs/manual/C/Makefile.in diff --git a/mousepad-git/docs/manual/C/Mousepad.xml b/mousepad-new/docs/manual/C/Mousepad.xml diff --git a/mousepad-git/docs/manual/C/Mousepad.xml.in b/mousepad-new/docs/manual/C/Mousepad.xml.in diff --git a/mousepad-git/docs/manual/C/images/Makefile b/mousepad-new/docs/manual/C/images/Makefile diff --git a/mousepad-git/docs/manual/C/images/Makefile.am b/mousepad-new/docs/manual/C/images/Makefile.am diff --git a/mousepad-git/docs/manual/C/images/Makefile.in b/mousepad-new/docs/manual/C/images/Makefile.in diff --git a/mousepad-git/docs/manual/C/images/find-and-replace.png b/mousepad-new/docs/manual/C/images/find-and-replace.png diff --git a/mousepad-git/docs/manual/C/images/go-to.png b/mousepad-new/docs/manual/C/images/go-to.png diff --git a/mousepad-git/docs/manual/C/images/main-window.png b/mousepad-new/docs/manual/C/images/main-window.png diff --git a/mousepad-git/docs/manual/C/images/other-tab-size.png b/mousepad-new/docs/manual/C/images/other-tab-size.png diff --git a/mousepad-git/docs/manual/C/images/paste-from-history.png b/mousepad-new/docs/manual/C/images/paste-from-history.png diff --git a/mousepad-git/docs/manual/C/images/tab-size-menu.png b/mousepad-new/docs/manual/C/images/tab-size-menu.png diff --git a/mousepad-git/docs/manual/C/images/typeahead-search.png b/mousepad-new/docs/manual/C/images/typeahead-search.png diff --git a/mousepad-git/docs/manual/Makefile b/mousepad-new/docs/manual/Makefile diff --git a/mousepad-git/docs/manual/Makefile.am b/mousepad-new/docs/manual/Makefile.am diff --git a/mousepad-git/docs/manual/Makefile.in b/mousepad-new/docs/manual/Makefile.in diff --git a/mousepad-git/docs/manual/mousepad.css b/mousepad-new/docs/manual/mousepad.css diff --git a/mousepad-git/docs/manual/mousepad.xsl b/mousepad-new/docs/manual/mousepad.xsl diff --git a/mousepad-git/icons/16x16/Makefile b/mousepad-new/icons/16x16/Makefile diff --git a/mousepad-git/icons/16x16/Makefile.am b/mousepad-new/icons/16x16/Makefile.am diff --git a/mousepad-git/icons/16x16/Makefile.in b/mousepad-new/icons/16x16/Makefile.in diff --git a/mousepad-git/icons/16x16/Mousepad.png b/mousepad-new/icons/16x16/Mousepad.png diff --git a/mousepad-git/icons/24x24/Makefile b/mousepad-new/icons/24x24/Makefile diff --git a/mousepad-git/icons/24x24/Makefile.am b/mousepad-new/icons/24x24/Makefile.am diff --git a/mousepad-git/icons/24x24/Makefile.in b/mousepad-new/icons/24x24/Makefile.in diff --git a/mousepad-git/icons/24x24/Mousepad.png b/mousepad-new/icons/24x24/Mousepad.png diff --git a/mousepad-git/icons/Makefile b/mousepad-new/icons/Makefile diff --git a/mousepad-git/icons/Makefile.am b/mousepad-new/icons/Makefile.am diff --git a/mousepad-git/icons/Makefile.in b/mousepad-new/icons/Makefile.in diff --git a/mousepad-git/icons/scalable/Makefile b/mousepad-new/icons/scalable/Makefile diff --git a/mousepad-git/icons/scalable/Makefile.am b/mousepad-new/icons/scalable/Makefile.am diff --git a/mousepad-git/icons/scalable/Makefile.in b/mousepad-new/icons/scalable/Makefile.in diff --git a/mousepad-git/icons/scalable/Mousepad.svg b/mousepad-new/icons/scalable/Mousepad.svg diff --git a/mousepad-git/install-sh b/mousepad-new/install-sh diff --git a/mousepad-git/intltool-extract.in b/mousepad-new/intltool-extract.in diff --git a/mousepad-git/intltool-merge.in b/mousepad-new/intltool-merge.in diff --git a/mousepad-git/intltool-update.in b/mousepad-new/intltool-update.in diff --git a/mousepad-git/libtool b/mousepad-new/libtool diff --git a/mousepad-git/ltmain.sh b/mousepad-new/ltmain.sh diff --git a/mousepad-git/missing b/mousepad-new/missing diff --git a/mousepad-git/mkinstalldirs b/mousepad-new/mkinstalldirs diff --git a/mousepad-git/mousepad/.deps/mousepad-main.Po b/mousepad-new/mousepad/.deps/mousepad-main.Po diff --git a/mousepad-git/mousepad/.deps/mousepad-mousepad-application.Po b/mousepad-new/mousepad/.deps/mousepad-mousepad-application.Po diff --git a/mousepad-git/mousepad/.deps/mousepad-mousepad-dbus.Po b/mousepad-new/mousepad/.deps/mousepad-mousepad-dbus.Po diff --git a/mousepad-git/mousepad/.deps/mousepad-mousepad-dialogs.Po b/mousepad-new/mousepad/.deps/mousepad-mousepad-dialogs.Po diff --git a/mousepad-git/mousepad/.deps/mousepad-mousepad-document.Po b/mousepad-new/mousepad/.deps/mousepad-mousepad-document.Po diff --git a/mousepad-git/mousepad/.deps/mousepad-mousepad-encoding-dialog.Po b/mousepad-new/mousepad/.deps/mousepad-mousepad-encoding-dialog.Po diff --git a/mousepad-git/mousepad/.deps/mousepad-mousepad-encoding.Po b/mousepad-new/mousepad/.deps/mousepad-mousepad-encoding.Po diff --git a/mousepad-git/mousepad/.deps/mousepad-mousepad-file.Po b/mousepad-new/mousepad/.deps/mousepad-mousepad-file.Po diff --git a/mousepad-git/mousepad/.deps/mousepad-mousepad-marshal.Po b/mousepad-new/mousepad/.deps/mousepad-mousepad-marshal.Po diff --git a/mousepad-git/mousepad/.deps/mousepad-mousepad-preferences.Po b/mousepad-new/mousepad/.deps/mousepad-mousepad-preferences.Po diff --git a/mousepad-git/mousepad/.deps/mousepad-mousepad-print.Po b/mousepad-new/mousepad/.deps/mousepad-mousepad-print.Po diff --git a/mousepad-git/mousepad/.deps/mousepad-mousepad-replace-dialog.Po b/mousepad-new/mousepad/.deps/mousepad-mousepad-replace-dialog.Po diff --git a/mousepad-git/mousepad/.deps/mousepad-mousepad-search-bar.Po b/mousepad-new/mousepad/.deps/mousepad-mousepad-search-bar.Po diff --git a/mousepad-git/mousepad/.deps/mousepad-mousepad-statusbar.Po b/mousepad-new/mousepad/.deps/mousepad-mousepad-statusbar.Po diff --git a/mousepad-git/mousepad/.deps/mousepad-mousepad-undo.Po b/mousepad-new/mousepad/.deps/mousepad-mousepad-undo.Po diff --git a/mousepad-git/mousepad/.deps/mousepad-mousepad-util.Po b/mousepad-new/mousepad/.deps/mousepad-mousepad-util.Po diff --git a/mousepad-git/mousepad/.deps/mousepad-mousepad-view.Po b/mousepad-new/mousepad/.deps/mousepad-mousepad-view.Po diff --git a/mousepad-git/mousepad/.deps/mousepad-mousepad-window.Po b/mousepad-new/mousepad/.deps/mousepad-mousepad-window.Po diff --git a/mousepad-git/mousepad/Makefile b/mousepad-new/mousepad/Makefile diff --git a/mousepad-git/mousepad/Makefile.am b/mousepad-new/mousepad/Makefile.am diff --git a/mousepad-git/mousepad/Makefile.in b/mousepad-new/mousepad/Makefile.in diff --git a/mousepad-git/mousepad/main.c b/mousepad-new/mousepad/main.c diff --git a/mousepad-git/mousepad/mousepad b/mousepad-new/mousepad/mousepad index 2d83d90..875e9c0 100755 Binary files a/mousepad-git/mousepad/mousepad and b/mousepad-new/mousepad/mousepad differ diff --git a/mousepad-git/mousepad/mousepad-application.c b/mousepad-new/mousepad/mousepad-application.c diff --git a/mousepad-git/mousepad/mousepad-application.h b/mousepad-new/mousepad/mousepad-application.h diff --git a/mousepad-git/mousepad/mousepad-dbus-infos.h b/mousepad-new/mousepad/mousepad-dbus-infos.h diff --git a/mousepad-git/mousepad/mousepad-dbus-infos.xml b/mousepad-new/mousepad/mousepad-dbus-infos.xml diff --git a/mousepad-git/mousepad/mousepad-dbus.c b/mousepad-new/mousepad/mousepad-dbus.c diff --git a/mousepad-git/mousepad/mousepad-dbus.h b/mousepad-new/mousepad/mousepad-dbus.h diff --git a/mousepad-git/mousepad/mousepad-dialogs.c b/mousepad-new/mousepad/mousepad-dialogs.c diff --git a/mousepad-git/mousepad/mousepad-dialogs.h b/mousepad-new/mousepad/mousepad-dialogs.h diff --git a/mousepad-git/mousepad/mousepad-document.c b/mousepad-new/mousepad/mousepad-document.c index fc0c127..dbd4c14 100644 --- a/mousepad-git/mousepad/mousepad-document.c +++ b/mousepad-new/mousepad/mousepad-document.c @@ -97,6 +97,7 @@ struct _MousepadDocumentPrivate /* settings */ guint word_wrap : 1; + guint statusbar : 1; }; @@ -166,7 +167,7 @@ static void mousepad_document_init (MousepadDocument *document) { GtkTargetList *target_list; - gboolean word_wrap, auto_indent, line_numbers, insert_spaces; + gboolean word_wrap, auto_indent, line_numbers, insert_spaces, view_statusbar; gchar *font_name; gint tab_size; MousepadPreferences *preferences; @@ -178,6 +179,7 @@ mousepad_document_init (MousepadDocument *document) document->priv->utf8_filename = NULL; document->priv->utf8_basename = NULL; document->priv->label = NULL; + document->priv->statusbar = 0; /* setup the scolled window */ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (document), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); @@ -220,6 +222,7 @@ mousepad_document_init (MousepadDocument *document) "view-font-name", &font_name, "view-tab-size", &tab_size, "view-insert-spaces", &insert_spaces, + "view-statusbar-visible", &view_statusbar, NULL); /* release the preferences */ @@ -228,11 +231,12 @@ mousepad_document_init (MousepadDocument *document) /* set all the settings */ mousepad_document_set_word_wrap (document, word_wrap); mousepad_document_set_font (document, font_name); + mousepad_document_set_statusbar(document,view_statusbar); mousepad_view_set_line_numbers (document->textview, line_numbers); mousepad_view_set_auto_indent (document->textview, auto_indent); mousepad_view_set_tab_size (document->textview, tab_size); mousepad_view_set_insert_spaces (document->textview, insert_spaces); - + /* cleanup */ g_free (font_name); @@ -452,6 +456,21 @@ mousepad_document_set_overwrite (MousepadDocument *document, void +mousepad_document_set_statusbar (MousepadDocument *document, + gboolean statusbar) +{ + mousepad_return_if_fail (MOUSEPAD_IS_DOCUMENT (document)); + + /* store the setting */ + document->priv->statusbar = statusbar; + + /* hint_ we do not apply the setting here. We only apply the setting + when the document is actually activated */ +} + + + +void mousepad_document_set_word_wrap (MousepadDocument *document, gboolean word_wrap) { @@ -466,7 +485,6 @@ mousepad_document_set_word_wrap (MousepadDocument *document, } - void mousepad_document_set_font (MousepadDocument *document, const gchar *font_name) @@ -604,6 +622,14 @@ mousepad_document_get_filename (MousepadDocument *document) } +gboolean +mousepad_document_get_statusbar (MousepadDocument *document) +{ + mousepad_return_val_if_fail (MOUSEPAD_IS_DOCUMENT (document), FALSE); + + return document->priv->statusbar; +} + gboolean mousepad_document_get_word_wrap (MousepadDocument *document) diff --git a/mousepad-git/mousepad/mousepad-document.h b/mousepad-new/mousepad/mousepad-document.h index 7e2b7a2..5ac480d 100644 --- a/mousepad-git/mousepad/mousepad-document.h +++ b/mousepad-new/mousepad/mousepad-document.h @@ -74,6 +74,9 @@ void mousepad_document_set_overwrite (MousepadDocument *document, void mousepad_document_set_word_wrap (MousepadDocument *document, gboolean word_wrap); +void mousepad_document_set_statusbar (MousepadDocument *document, + gboolean statusbar); + void mousepad_document_focus_textview (MousepadDocument *document); void mousepad_document_send_signals (MousepadDocument *document); @@ -86,6 +89,8 @@ const gchar *mousepad_document_get_filename (MousepadDocument *document); gboolean mousepad_document_get_word_wrap (MousepadDocument *document); +gboolean mousepad_document_get_statusbar (MousepadDocument *document); + G_END_DECLS #endif /* !__MOUSEPAD_DOCUMENT_H__ */ diff --git a/mousepad-git/mousepad/mousepad-encoding-dialog.c b/mousepad-new/mousepad/mousepad-encoding-dialog.c diff --git a/mousepad-git/mousepad/mousepad-encoding-dialog.h b/mousepad-new/mousepad/mousepad-encoding-dialog.h diff --git a/mousepad-git/mousepad/mousepad-encoding.c b/mousepad-new/mousepad/mousepad-encoding.c diff --git a/mousepad-git/mousepad/mousepad-encoding.h b/mousepad-new/mousepad/mousepad-encoding.h diff --git a/mousepad-git/mousepad/mousepad-file.c b/mousepad-new/mousepad/mousepad-file.c diff --git a/mousepad-git/mousepad/mousepad-file.h b/mousepad-new/mousepad/mousepad-file.h diff --git a/mousepad-git/mousepad/mousepad-main.o b/mousepad-new/mousepad/mousepad-main.o diff --git a/mousepad-git/mousepad/mousepad-marshal.c b/mousepad-new/mousepad/mousepad-marshal.c diff --git a/mousepad-git/mousepad/mousepad-marshal.h b/mousepad-new/mousepad/mousepad-marshal.h diff --git a/mousepad-git/mousepad/mousepad-marshal.list b/mousepad-new/mousepad/mousepad-marshal.list diff --git a/mousepad-git/mousepad/mousepad-mousepad-application.o b/mousepad-new/mousepad/mousepad-mousepad-application.o index 38154d9..1aedbc3 100644 Binary files a/mousepad-git/mousepad/mousepad-mousepad-application.o and b/mousepad-new/mousepad/mousepad-mousepad-application.o differ diff --git a/mousepad-git/mousepad/mousepad-mousepad-dbus.o b/mousepad-new/mousepad/mousepad-mousepad-dbus.o diff --git a/mousepad-git/mousepad/mousepad-mousepad-dialogs.o b/mousepad-new/mousepad/mousepad-mousepad-dialogs.o diff --git a/mousepad-git/mousepad/mousepad-mousepad-document.o b/mousepad-new/mousepad/mousepad-mousepad-document.o index a824ce7..ad9235c 100644 Binary files a/mousepad-git/mousepad/mousepad-mousepad-document.o and b/mousepad-new/mousepad/mousepad-mousepad-document.o differ diff --git a/mousepad-git/mousepad/mousepad-mousepad-encoding-dialog.o b/mousepad-new/mousepad/mousepad-mousepad-encoding-dialog.o index 90aeb18..808cea3 100644 Binary files a/mousepad-git/mousepad/mousepad-mousepad-encoding-dialog.o and b/mousepad-new/mousepad/mousepad-mousepad-encoding-dialog.o differ diff --git a/mousepad-git/mousepad/mousepad-mousepad-encoding.o b/mousepad-new/mousepad/mousepad-mousepad-encoding.o diff --git a/mousepad-git/mousepad/mousepad-mousepad-file.o b/mousepad-new/mousepad/mousepad-mousepad-file.o diff --git a/mousepad-git/mousepad/mousepad-mousepad-marshal.o b/mousepad-new/mousepad/mousepad-mousepad-marshal.o diff --git a/mousepad-git/mousepad/mousepad-mousepad-preferences.o b/mousepad-new/mousepad/mousepad-mousepad-preferences.o index efc0d39..59903d6 100644 Binary files a/mousepad-git/mousepad/mousepad-mousepad-preferences.o and b/mousepad-new/mousepad/mousepad-mousepad-preferences.o differ diff --git a/mousepad-git/mousepad/mousepad-mousepad-print.o b/mousepad-new/mousepad/mousepad-mousepad-print.o index 72dd9f8..91bd413 100644 Binary files a/mousepad-git/mousepad/mousepad-mousepad-print.o and b/mousepad-new/mousepad/mousepad-mousepad-print.o differ diff --git a/mousepad-git/mousepad/mousepad-mousepad-replace-dialog.o b/mousepad-new/mousepad/mousepad-mousepad-replace-dialog.o index 738e211..328148b 100644 Binary files a/mousepad-git/mousepad/mousepad-mousepad-replace-dialog.o and b/mousepad-new/mousepad/mousepad-mousepad-replace-dialog.o differ diff --git a/mousepad-git/mousepad/mousepad-mousepad-search-bar.o b/mousepad-new/mousepad/mousepad-mousepad-search-bar.o index dff0b5a..1d2e1c0 100644 Binary files a/mousepad-git/mousepad/mousepad-mousepad-search-bar.o and b/mousepad-new/mousepad/mousepad-mousepad-search-bar.o differ diff --git a/mousepad-git/mousepad/mousepad-mousepad-statusbar.o b/mousepad-new/mousepad/mousepad-mousepad-statusbar.o index c3c96dc..8da52e4 100644 Binary files a/mousepad-git/mousepad/mousepad-mousepad-statusbar.o and b/mousepad-new/mousepad/mousepad-mousepad-statusbar.o differ diff --git a/mousepad-git/mousepad/mousepad-mousepad-undo.o b/mousepad-new/mousepad/mousepad-mousepad-undo.o diff --git a/mousepad-git/mousepad/mousepad-mousepad-util.o b/mousepad-new/mousepad/mousepad-mousepad-util.o diff --git a/mousepad-git/mousepad/mousepad-mousepad-view.o b/mousepad-new/mousepad/mousepad-mousepad-view.o diff --git a/mousepad-git/mousepad/mousepad-mousepad-window.o b/mousepad-new/mousepad/mousepad-mousepad-window.o index 20de8d9..1fbcdbf 100644 Binary files a/mousepad-git/mousepad/mousepad-mousepad-window.o and b/mousepad-new/mousepad/mousepad-mousepad-window.o differ diff --git a/mousepad-git/mousepad/mousepad-preferences.c b/mousepad-new/mousepad/mousepad-preferences.c index 96a810f..bed64d1 100644 --- a/mousepad-git/mousepad/mousepad-preferences.c +++ b/mousepad-new/mousepad/mousepad-preferences.c @@ -216,6 +216,14 @@ mousepad_preferences_class_init (MousepadPreferencesClass *klass) MOUSEPAD_PARAM_READWRITE)); + g_object_class_install_property (gobject_class, + PROP_WINDOW_STATUSBAR_VISIBLE, + g_param_spec_boolean ("view-statusbar-visible", + "ViewStatusbarVisible", + NULL, + TRUE, + MOUSEPAD_PARAM_READWRITE)); + /** * Window Preferences **/ @@ -235,15 +243,6 @@ mousepad_preferences_class_init (MousepadPreferencesClass *klass) 1, G_MAXINT, 640, MOUSEPAD_PARAM_READWRITE)); - g_object_class_install_property (gobject_class, - PROP_WINDOW_STATUSBAR_VISIBLE, - g_param_spec_boolean ("window-statusbar-visible", - "WindowStatusbarVisible", - NULL, - TRUE, - MOUSEPAD_PARAM_READWRITE)); - - /** * Hidden Preferences **/ diff --git a/mousepad-git/mousepad/mousepad-preferences.h b/mousepad-new/mousepad/mousepad-preferences.h diff --git a/mousepad-git/mousepad/mousepad-print.c b/mousepad-new/mousepad/mousepad-print.c diff --git a/mousepad-git/mousepad/mousepad-print.h b/mousepad-new/mousepad/mousepad-print.h diff --git a/mousepad-git/mousepad/mousepad-private.h b/mousepad-new/mousepad/mousepad-private.h diff --git a/mousepad-git/mousepad/mousepad-replace-dialog.c b/mousepad-new/mousepad/mousepad-replace-dialog.c diff --git a/mousepad-git/mousepad/mousepad-replace-dialog.h b/mousepad-new/mousepad/mousepad-replace-dialog.h diff --git a/mousepad-git/mousepad/mousepad-search-bar.c b/mousepad-new/mousepad/mousepad-search-bar.c diff --git a/mousepad-git/mousepad/mousepad-search-bar.h b/mousepad-new/mousepad/mousepad-search-bar.h diff --git a/mousepad-git/mousepad/mousepad-statusbar.c b/mousepad-new/mousepad/mousepad-statusbar.c diff --git a/mousepad-git/mousepad/mousepad-statusbar.h b/mousepad-new/mousepad/mousepad-statusbar.h diff --git a/mousepad-git/mousepad/mousepad-undo.c b/mousepad-new/mousepad/mousepad-undo.c diff --git a/mousepad-git/mousepad/mousepad-undo.h b/mousepad-new/mousepad/mousepad-undo.h diff --git a/mousepad-git/mousepad/mousepad-util.c b/mousepad-new/mousepad/mousepad-util.c diff --git a/mousepad-git/mousepad/mousepad-util.h b/mousepad-new/mousepad/mousepad-util.h diff --git a/mousepad-git/mousepad/mousepad-view.c b/mousepad-new/mousepad/mousepad-view.c diff --git a/mousepad-git/mousepad/mousepad-view.h b/mousepad-new/mousepad/mousepad-view.h diff --git a/mousepad-git/mousepad/mousepad-window-ui.h b/mousepad-new/mousepad/mousepad-window-ui.h index c8916b7..0171f1b 100644 --- a/mousepad-git/mousepad/mousepad-window-ui.h +++ b/mousepad-new/mousepad/mousepad-window-ui.h @@ -25,35 +25,35 @@ static const char mousepad_window_ui[] = "separator /><" - "menuitem action=\"strip-trailing\" /><" - "/menu>" + "=\"replace\" />" + "<" + "separator /><" + "/popup>" }; -static const unsigned mousepad_window_ui_length = 3016u; +static const unsigned mousepad_window_ui_length = 2967u; diff --git a/mousepad-git/mousepad/mousepad-window-ui.xml b/mousepad-new/mousepad/mousepad-window-ui.xml index bdf3dc5..fd438e1 100644 --- a/mousepad-git/mousepad/mousepad-window-ui.xml +++ b/mousepad-new/mousepad/mousepad-window-ui.xml @@ -67,9 +67,18 @@ - - + + + + + + + + + + + @@ -95,28 +104,15 @@ - - - - - - - - - - - - - - - + + diff --git a/mousepad-git/mousepad/mousepad-window.c b/mousepad-new/mousepad/mousepad-window.c index 66cd837..a1e0291 100644 --- a/mousepad-git/mousepad/mousepad-window.c +++ b/mousepad-new/mousepad/mousepad-window.c @@ -99,6 +99,9 @@ static gboolean mousepad_window_close_document (MousepadW MousepadDocument *document); static void mousepad_window_set_title (MousepadWindow *window); +static void mousepad_window_show_statusbar (MousepadWindow *window, + gboolean show_statusbar); + /* notebook signals */ static void mousepad_window_notebook_switch_page (GtkNotebook *notebook, GtkNotebookPage *page, @@ -534,10 +537,8 @@ mousepad_window_init (MousepadWindow *window) GtkWidget *separator; GtkWidget *ebox; GtkWidget *item; - GtkAction *action; gint width, height; - gboolean statusbar_visible; - + /* initialize stuff */ window->save_geometry_timer_id = 0; window->update_recent_menu_id = 0; @@ -576,7 +577,6 @@ mousepad_window_init (MousepadWindow *window) g_object_get (G_OBJECT (window->preferences), "window-width", &width, "window-height", &height, - "window-statusbar-visible", &statusbar_visible, NULL); /* set the default window size */ @@ -678,11 +678,7 @@ mousepad_window_init (MousepadWindow *window) gtk_box_pack_start (GTK_BOX (window->box), window->notebook, TRUE, TRUE, PADDING); gtk_widget_show (window->notebook); - /* check if we should display the statusbar by default */ - action = gtk_action_group_get_action (window->action_group, "statusbar"); - gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), statusbar_visible); - - /* allow drops in the window */ + /* allow drops in the window */ gtk_drag_dest_set (GTK_WIDGET (window), GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_DROP, drop_targets, G_N_ELEMENTS (drop_targets), GDK_ACTION_COPY | GDK_ACTION_MOVE); g_signal_connect (G_OBJECT (window), "drag-data-received", G_CALLBACK (mousepad_window_drag_data_received), window); @@ -1282,6 +1278,44 @@ mousepad_window_set_title (MousepadWindow *window) g_free (string); } +/** + * shows or hides the main window status bar + **/ +static void +mousepad_window_show_statusbar (MousepadWindow *window, + gboolean show_statusbar) +{ + + /* check if we should drop the statusbar */ + if (!show_statusbar && window->statusbar != NULL) + { + /* destroy the statusbar */ + gtk_widget_destroy (window->statusbar); + window->statusbar = NULL; + } + else if (show_statusbar && window->statusbar == NULL) + { + /* setup a new statusbar */ + window->statusbar = mousepad_statusbar_new (); + gtk_box_pack_end (GTK_BOX (window->box), window->statusbar, FALSE, FALSE, 0); + gtk_widget_show (window->statusbar); + + /* overwrite toggle signal */ + g_signal_connect_swapped (G_OBJECT (window->statusbar), "enable-overwrite", + G_CALLBACK (mousepad_window_action_statusbar_overwrite), window); + + /* update the statusbar items */ + if (window->active) + { + /* debug check */ + mousepad_return_if_fail (MOUSEPAD_IS_DOCUMENT (window->active)); + + /* ask document to resend the cursor status signals */ + mousepad_document_send_signals (window->active); + } + } + +} /** @@ -1294,7 +1328,8 @@ mousepad_window_notebook_switch_page (GtkNotebook *notebook, MousepadWindow *window) { MousepadDocument *document; - + gboolean show_statusbar; + mousepad_return_if_fail (MOUSEPAD_IS_WINDOW (window)); mousepad_return_if_fail (GTK_IS_NOTEBOOK (notebook)); @@ -1313,6 +1348,10 @@ mousepad_window_notebook_switch_page (GtkNotebook *notebook, /* update the menu actions */ mousepad_window_update_actions (window); + /* show the status bar if needed */ + show_statusbar = mousepad_document_get_statusbar(window->active); + mousepad_window_show_statusbar(window,show_statusbar); + /* update the statusbar */ mousepad_document_send_signals (window->active); } @@ -1907,7 +1946,7 @@ mousepad_window_menu_tab_sizes (MousepadWindow *window) /* add the action to the go menu */ gtk_ui_manager_add_ui (window->ui_manager, merge_id, - "/main-menu/document-menu/tab-size-menu/placeholder-tab-items", + "/main-menu/view-menu/tab-size-menu/placeholder-tab-items", name, name, GTK_UI_MANAGER_MENUITEM, FALSE); /* cleanup */ @@ -1928,7 +1967,7 @@ mousepad_window_menu_tab_sizes (MousepadWindow *window) /* add the action to the go menu */ gtk_ui_manager_add_ui (window->ui_manager, merge_id, - "/main-menu/document-menu/tab-size-menu/placeholder-tab-items", + "/main-menu/view-menu/tab-size-menu/placeholder-tab-items", "tab-size-other", "tab-size-other", GTK_UI_MANAGER_MENUITEM, FALSE); /* unlock */ @@ -2111,6 +2150,10 @@ mousepad_window_update_actions (MousepadWindow *window) action = gtk_action_group_get_action (window->action_group, "auto-indent"); gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), active); + active = mousepad_document_get_statusbar(document); + action = gtk_action_group_get_action (window->action_group, "statusbar"); + gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), active); + /* update the tabs size menu */ mousepad_window_menu_tab_sizes_update (window); @@ -4117,37 +4160,14 @@ mousepad_window_action_statusbar (GtkToggleAction *action, /* whether we show the statusbar */ show_statusbar = gtk_toggle_action_get_active (action); - /* check if we should drop the statusbar */ - if (!show_statusbar && window->statusbar != NULL) - { - /* destroy the statusbar */ - gtk_widget_destroy (window->statusbar); - window->statusbar = NULL; - } - else if (show_statusbar && window->statusbar == NULL) - { - /* setup a new statusbar */ - window->statusbar = mousepad_statusbar_new (); - gtk_box_pack_end (GTK_BOX (window->box), window->statusbar, FALSE, FALSE, 0); - gtk_widget_show (window->statusbar); - - /* overwrite toggle signal */ - g_signal_connect_swapped (G_OBJECT (window->statusbar), "enable-overwrite", - G_CALLBACK (mousepad_window_action_statusbar_overwrite), window); - - /* update the statusbar items */ - if (window->active) - { - /* debug check */ - mousepad_return_if_fail (MOUSEPAD_IS_DOCUMENT (window->active)); - - /* ask document to resend the cursor status signals */ - mousepad_document_send_signals (window->active); - } - } + /* now show or hide statusbar */ + mousepad_window_show_statusbar(window,show_statusbar); - /* remember the setting */ - g_object_set (G_OBJECT (window->preferences), "window-statusbar-visible", show_statusbar, NULL); + /* remember the setting for this tab */ + mousepad_document_set_statusbar(window->active,show_statusbar); + + /* remember the setting for every new tab*/ + g_object_set (G_OBJECT (window->preferences), "view-statusbar-visible", show_statusbar, NULL); } diff --git a/mousepad-git/mousepad/mousepad-window.h b/mousepad-new/mousepad/mousepad-window.h diff --git a/mousepad-git/po/.intltool-merge-cache b/mousepad-new/po/.intltool-merge-cache diff --git a/mousepad-git/po/ChangeLog b/mousepad-new/po/ChangeLog diff --git a/mousepad-git/po/LINGUAS b/mousepad-new/po/LINGUAS diff --git a/mousepad-git/po/Makefile b/mousepad-new/po/Makefile diff --git a/mousepad-git/po/Makefile.in b/mousepad-new/po/Makefile.in diff --git a/mousepad-git/po/Makefile.in.in b/mousepad-new/po/Makefile.in.in diff --git a/mousepad-git/po/POTFILES b/mousepad-new/po/POTFILES diff --git a/mousepad-git/po/POTFILES.in b/mousepad-new/po/POTFILES.in diff --git a/mousepad-git/po/mousepad.pot b/mousepad-new/po/mousepad.pot diff --git a/mousepad-git/po/stamp-it b/mousepad-new/po/stamp-it diff --git a/mousepad-git/stamp-h1 b/mousepad-new/stamp-h1