Author: benny
Date: 2006-07-01 10:38:19 +0000 (Sat, 01 Jul 2006)
New Revision: 22239
Modified:
thunar/trunk/ChangeLog
thunar/trunk/docs/README.thunarrc
thunar/trunk/thunar/thunar-preferences.c
thunar/trunk/thunar/thunar-window.c
Log:
2006-07-01 Benedikt Meurer <[EMAIL PROTECTED]>
* docs/README.thunarrc, thunar/thunar-preferences.c: Add a new option
MiscRememberGeometry, which controls whether Thunar will store the
window size whenever the user resizes the window.
* thunar/thunar-window.c: Don't save the window geometry unless the
MiscRememberGeometry setting is TRUE.
Modified: thunar/trunk/ChangeLog
===================================================================
--- thunar/trunk/ChangeLog 2006-07-01 09:22:03 UTC (rev 22238)
+++ thunar/trunk/ChangeLog 2006-07-01 10:38:19 UTC (rev 22239)
@@ -1,3 +1,11 @@
+2006-07-01 Benedikt Meurer <[EMAIL PROTECTED]>
+
+ * docs/README.thunarrc, thunar/thunar-preferences.c: Add a new option
+ MiscRememberGeometry, which controls whether Thunar will store the
+ window size whenever the user resizes the window.
+ * thunar/thunar-window.c: Don't save the window geometry unless the
+ MiscRememberGeometry setting is TRUE.
+
2006-06-14 Benedikt Meurer <[EMAIL PROTECTED]>
* thunar/thunar-renamer-dialog-ui.xml, thunar/thunar-renamer-dialog.c:
Modified: thunar/trunk/docs/README.thunarrc
===================================================================
--- thunar/trunk/docs/README.thunarrc 2006-07-01 09:22:03 UTC (rev 22238)
+++ thunar/trunk/docs/README.thunarrc 2006-07-01 10:38:19 UTC (rev 22239)
@@ -15,22 +15,22 @@
LastView preference.
* LastCompactViewZoomLevel (THUNAR_ZOOM_LEVEL_SMALLEST/
- THUNAR_ZOOM_LEVEL_SMALLER/
- THUNAR_ZOOM_LEVEL_SMALL/
- THUNAR_ZOOM_LEVEL_NORMAL/
- THUNAR_ZOOM_LEVEL_LARGE/
- THUNAR_ZOOM_LEVEL_LARGER/
- THUNAR_ZOOM_LEVEL_LARGEST)
+ THUNAR_ZOOM_LEVEL_SMALLER/
+ THUNAR_ZOOM_LEVEL_SMALL/
+ THUNAR_ZOOM_LEVEL_NORMAL/
+ THUNAR_ZOOM_LEVEL_LARGE/
+ THUNAR_ZOOM_LEVEL_LARGER/
+ THUNAR_ZOOM_LEVEL_LARGEST)
The last selected zoom level for the compact list view.
* LastDetailsViewZoomLevel (THUNAR_ZOOM_LEVEL_SMALLEST/
- THUNAR_ZOOM_LEVEL_SMALLER/
- THUNAR_ZOOM_LEVEL_SMALL/
- THUNAR_ZOOM_LEVEL_NORMAL/
- THUNAR_ZOOM_LEVEL_LARGE/
- THUNAR_ZOOM_LEVEL_LARGER/
- THUNAR_ZOOM_LEVEL_LARGEST)
+ THUNAR_ZOOM_LEVEL_SMALLER/
+ THUNAR_ZOOM_LEVEL_SMALL/
+ THUNAR_ZOOM_LEVEL_NORMAL/
+ THUNAR_ZOOM_LEVEL_LARGE/
+ THUNAR_ZOOM_LEVEL_LARGER/
+ THUNAR_ZOOM_LEVEL_LARGEST)
The last selected zoom level for the detailed list view.
@@ -40,7 +40,7 @@
information that appears in the detailed list view. Valid names
for the detailed list columns are:
- - THUNAR_COLUMN_DATE_ACCESSED
+ - THUNAR_COLUMN_DATE_ACCESSED
- THUNAR_COLUMN_DATE_MODIFIED
- THUNAR_COLUMN_GROUP
- THUNAR_COLUMN_MIME_TYPE
@@ -66,7 +66,7 @@
The comma separated list of visible columns in the detailed list
view. Valid names for the detailed list columns are:
- - THUNAR_COLUMN_DATE_ACCESSED
+ - THUNAR_COLUMN_DATE_ACCESSED
- THUNAR_COLUMN_DATE_MODIFIED
- THUNAR_COLUMN_GROUP
- THUNAR_COLUMN_MIME_TYPE
@@ -77,12 +77,12 @@
- THUNAR_COLUMN_TYPE
* LastIconViewZoomLevel (THUNAR_ZOOM_LEVEL_SMALLEST/
- THUNAR_ZOOM_LEVEL_SMALLER/
- THUNAR_ZOOM_LEVEL_SMALL/
- THUNAR_ZOOM_LEVEL_NORMAL/
- THUNAR_ZOOM_LEVEL_LARGE/
- THUNAR_ZOOM_LEVEL_LARGER/
- THUNAR_ZOOM_LEVEL_LARGEST)
+ THUNAR_ZOOM_LEVEL_SMALLER/
+ THUNAR_ZOOM_LEVEL_SMALL/
+ THUNAR_ZOOM_LEVEL_NORMAL/
+ THUNAR_ZOOM_LEVEL_LARGE/
+ THUNAR_ZOOM_LEVEL_LARGER/
+ THUNAR_ZOOM_LEVEL_LARGEST)
The last selected zoom level for the icon view.
@@ -164,6 +164,14 @@
Determines whether to apply permissions recursively everytime the
permissions are altered by the user.
+ * MiscRememberGeometry (FALSE/TRUE)
+
+ Whether Thunar should remember the size of windows and apply
+ that size to new windows. If TRUE the width and height are
+ saved to LastWindowWidth and LastWindowHeight. If FALSE the
+ user may specify the start size in LastWindowWith and
+ LastWindowHeight. This option is enabled by default.
+
* MiscShowAboutTemplates (FALSE/TRUE)
Whether to display the "About Templates" dialog, when opening the
@@ -197,11 +205,11 @@
* ShortcutsIconSize (THUNAR_ICON_SIZE_SMALLEST/
THUNAR_ICON_SIZE_SMALLER/
- THUNAR_ICON_SIZE_SMALL/
- THUNAR_ICON_SIZE_NORMAL/
- THUNAR_ICON_SIZE_LARGE/
- THUNAR_ICON_SIZE_LARGER/
- THUNAR_ICON_SIZE_LARGEST)
+ THUNAR_ICON_SIZE_SMALL/
+ THUNAR_ICON_SIZE_NORMAL/
+ THUNAR_ICON_SIZE_LARGE/
+ THUNAR_ICON_SIZE_LARGER/
+ THUNAR_ICON_SIZE_LARGEST)
The icon size to use for the icons displayed in the shortcuts side
pane.
@@ -212,12 +220,12 @@
the tree side pane.
* TreeIconSize (THUNAR_ICON_SIZE_SMALLEST/
- THUNAR_ICON_SIZE_SMALLER/
- THUNAR_ICON_SIZE_SMALL/
- THUNAR_ICON_SIZE_NORMAL/
- THUNAR_ICON_SIZE_LARGE/
- THUNAR_ICON_SIZE_LARGER/
- THUNAR_ICON_SIZE_LARGEST)
+ THUNAR_ICON_SIZE_SMALLER/
+ THUNAR_ICON_SIZE_SMALL/
+ THUNAR_ICON_SIZE_NORMAL/
+ THUNAR_ICON_SIZE_LARGE/
+ THUNAR_ICON_SIZE_LARGER/
+ THUNAR_ICON_SIZE_LARGEST)
The icon size to use for the icons displayed in the tree side pane.
Modified: thunar/trunk/thunar/thunar-preferences.c
===================================================================
--- thunar/trunk/thunar/thunar-preferences.c 2006-07-01 09:22:03 UTC (rev
22238)
+++ thunar/trunk/thunar/thunar-preferences.c 2006-07-01 10:38:19 UTC (rev
22239)
@@ -71,6 +71,7 @@
PROP_MISC_FOLDERS_FIRST,
PROP_MISC_HORIZONTAL_WHEEL_NAVIGATES,
PROP_MISC_RECURSIVE_PERMISSIONS,
+ PROP_MISC_REMEMBER_GEOMETRY,
PROP_MISC_SHOW_ABOUT_TEMPLATES,
PROP_MISC_SHOW_THUMBNAILS,
PROP_MISC_SINGLE_CLICK,
@@ -489,6 +490,23 @@
EXO_PARAM_READWRITE));
/**
+ * ThunarPreferences:misc-remember-geometry:
+ *
+ * Whether Thunar should remember the size of windows and apply
+ * that size to new windows. If %TRUE the width and height are
+ * saved to "last-window-width" and "last-window-height". If
+ * %FALSE the user may specify the start size in "last-window-with"
+ * and "last-window-height".
+ **/
+ g_object_class_install_property (gobject_class,
+ PROP_MISC_REMEMBER_GEOMETRY,
+ g_param_spec_boolean
("misc-remember-geometry",
+
"misc-remember-geometry",
+
"misc-remember-geometry",
+ TRUE,
+ EXO_PARAM_READWRITE));
+
+ /**
* ThunarPreferences:misc-show-about-templates:
*
* Whether to display the "About Templates" dialog, when opening the
Modified: thunar/trunk/thunar/thunar-window.c
===================================================================
--- thunar/trunk/thunar/thunar-window.c 2006-07-01 09:22:03 UTC (rev 22238)
+++ thunar/trunk/thunar/thunar-window.c 2006-07-01 10:38:19 UTC (rev 22239)
@@ -2071,25 +2071,31 @@
{
GdkWindowState state;
ThunarWindow *window = THUNAR_WINDOW (user_data);
+ gboolean remember_geometry;
gint width;
gint height;
GDK_THREADS_ENTER ();
- /* check if the window is still visible */
- if (GTK_WIDGET_VISIBLE (window))
+ /* check if we should remember the window geometry */
+ g_object_get (G_OBJECT (window->preferences), "misc-remember-geometry",
&remember_geometry, NULL);
+ if (G_LIKELY (remember_geometry))
{
- /* determine the current state of the window */
- state = gdk_window_get_state (GTK_WIDGET (window)->window);
-
- /* don't save geometry for maximized or fullscreen windows */
- if ((state & (GDK_WINDOW_STATE_MAXIMIZED | GDK_WINDOW_STATE_FULLSCREEN))
== 0)
+ /* check if the window is still visible */
+ if (GTK_WIDGET_VISIBLE (window))
{
- /* determine the current width/height of the window... */
- gtk_window_get_size (GTK_WINDOW (window), &width, &height);
+ /* determine the current state of the window */
+ state = gdk_window_get_state (GTK_WIDGET (window)->window);
- /* ...and remember them as default for new windows */
- g_object_set (G_OBJECT (window->preferences), "last-window-width",
width, "last-window-height", height, NULL);
+ /* don't save geometry for maximized or fullscreen windows */
+ if ((state & (GDK_WINDOW_STATE_MAXIMIZED |
GDK_WINDOW_STATE_FULLSCREEN)) == 0)
+ {
+ /* determine the current width/height of the window... */
+ gtk_window_get_size (GTK_WINDOW (window), &width, &height);
+
+ /* ...and remember them as default for new windows */
+ g_object_set (G_OBJECT (window->preferences),
"last-window-width", width, "last-window-height", height, NULL);
+ }
}
}
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
