From 54e4bb8dcd30cc0b9a815fd4e14a5b4efcc184c6 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Wed, 8 Mar 2017 14:08:09 -0500 Subject: [PATCH 01/19] Revert "Remove all references to gnome-session-properties" This reverts commit 0c6fe6ca14b65cdfc1cd039a5cc9cb83ea346d6b. --- data/icons/16x16/session-properties.png | Bin 0 -> 595 bytes data/icons/22x22/session-properties.png | Bin 0 -> 754 bytes data/icons/24x24/session-properties.png | Bin 0 -> 784 bytes data/icons/32x32/session-properties.png | Bin 0 -> 1109 bytes data/icons/48x48/session-properties.png | Bin 0 -> 1839 bytes data/icons/meson.build | 24 + data/icons/scalable/session-properties.svg | 515 ++++++++++++++++++ .../symbolic/session-properties-symbolic.svg | 28 + data/meson.build | 3 + data/session-properties.ui | 323 +++++++++++ doc/man/gnome-session.1 | 2 + po/POTFILES.in | 1 + 12 files changed, 896 insertions(+) create mode 100644 data/icons/16x16/session-properties.png create mode 100644 data/icons/22x22/session-properties.png create mode 100644 data/icons/24x24/session-properties.png create mode 100644 data/icons/32x32/session-properties.png create mode 100644 data/icons/48x48/session-properties.png create mode 100644 data/icons/meson.build create mode 100644 data/icons/scalable/session-properties.svg create mode 100644 data/icons/symbolic/session-properties-symbolic.svg create mode 100644 data/session-properties.ui diff --git a/data/icons/16x16/session-properties.png b/data/icons/16x16/session-properties.png new file mode 100644 index 00000000..1367c20a Binary files /dev/null and b/data/icons/16x16/session-properties.png differ diff --git a/data/icons/22x22/session-properties.png b/data/icons/22x22/session-properties.png new file mode 100644 index 00000000..12225ee3 Binary files /dev/null and b/data/icons/22x22/session-properties.png differ diff --git a/data/icons/24x24/session-properties.png b/data/icons/24x24/session-properties.png new file mode 100644 index 00000000..ac81c7ad Binary files /dev/null and b/data/icons/24x24/session-properties.png differ diff --git a/data/icons/32x32/session-properties.png b/data/icons/32x32/session-properties.png new file mode 100644 index 00000000..25df9d36 Binary files /dev/null and b/data/icons/32x32/session-properties.png differ diff --git a/data/icons/48x48/session-properties.png b/data/icons/48x48/session-properties.png new file mode 100644 index 00000000..32c2358c Binary files /dev/null and b/data/icons/48x48/session-properties.png differ diff --git a/data/icons/meson.build b/data/icons/meson.build new file mode 100644 index 00000000..e653dfa9 --- /dev/null +++ b/data/icons/meson.build @@ -0,0 +1,24 @@ +icons = [ + '16x16', + '22x22', + '24x24', + '32x32', + '48x48' +] + +foreach icon: icons + install_data( + join_paths(icon, 'session-properties.png'), + install_dir: join_paths(session_datadir, 'icons', 'hicolor', icon, 'apps') + ) +endforeach + +install_data( + 'scalable/session-properties.svg', + install_dir: join_paths(session_datadir, 'icons', 'hicolor', 'scalable', 'apps') +) + +install_data( + 'symbolic/session-properties-symbolic.svg', + install_dir: join_paths(session_datadir, 'icons', 'hicolor', 'symbolic', 'apps') +) diff --git a/data/icons/scalable/session-properties.svg b/data/icons/scalable/session-properties.svg new file mode 100644 index 00000000..cec2c39e --- /dev/null +++ b/data/icons/scalable/session-properties.svg @@ -0,0 +1,515 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Jakub Steiner + + + http://jimmac.musichall.cz + + Gnome Session Properties + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/icons/symbolic/session-properties-symbolic.svg b/data/icons/symbolic/session-properties-symbolic.svg new file mode 100644 index 00000000..497fb9d0 --- /dev/null +++ b/data/icons/symbolic/session-properties-symbolic.svg @@ -0,0 +1,28 @@ + + + + + + + + image/svg+xml + + Gnome Symbolic Icon Theme + + + + + + + Gnome Symbolic Icon Theme + + + + + + + + + + + diff --git a/data/meson.build b/data/meson.build index 89af98f8..b79a5fbd 100644 --- a/data/meson.build +++ b/data/meson.build @@ -1,30 +1,32 @@ +subdir('icons') + desktop = 'gnome.desktop' # FIXME: The same target can not be copied into two directories. # There is a workaround in meson_post_install.py until proper solution arises: # https://groups.google.com/forum/#!topic/mesonbuild/3iIoYPrN4P0 i18n.merge_file( desktop, type: 'desktop', input: desktop + '.in', output: desktop, po_dir: po_dir, install: true, #install_dir: [ # join_paths(session_datadir, 'xsessions'), # join_paths(session_datadir, 'wayland-sessions') #] install_dir: join_paths(session_datadir, 'xsessions') ) desktop = 'gnome-xorg.desktop' i18n.merge_file( desktop, type: 'desktop', input: desktop + '.in', output: desktop, po_dir: po_dir, install: true, install_dir: join_paths(session_datadir, 'xsessions') ) @@ -48,51 +50,52 @@ foreach session: sessions i18n.merge_file( session, type: 'desktop', input: desktop_in, output: session, po_dir: po_dir, install: true, install_dir: join_paths(session_pkgdatadir, 'sessions') ) endforeach schema_conf = configuration_data() schema = 'org.gnome.SessionManager.gschema.xml' configure_file( input: schema + '.in', output: schema, install: true, install_dir: join_paths(session_datadir, 'glib-2.0', 'schemas'), configuration: schema_conf ) install_data( 'gnome-session.convert', install_dir: join_paths(session_datadir, 'GConf', 'gsettings') ) data = files('hardware-compatibility') +data += files('session-properties.ui') if enable_session_selector data += files('session-selector.ui') desktop = 'gnome-custom-session.desktop' i18n.merge_file( desktop, type: 'desktop', input: desktop + '.in', output: desktop, po_dir: po_dir, install: true, install_dir: join_paths(session_datadir, 'xsessions') ) endif install_data( data, install_dir: session_pkgdatadir ) diff --git a/data/session-properties.ui b/data/session-properties.ui new file mode 100644 index 00000000..1f0cb9a5 --- /dev/null +++ b/data/session-properties.ui @@ -0,0 +1,323 @@ + + + + + + True + True + 6 + + + True + 12 + vertical + 3 + + + True + 0 + 3 + 3 + Additional startup _programs: + True + session_properties_treeview + + + False + 0 + + + + + True + 6 + + + True + True + never + automatic + etched-in + + + 210 + True + True + + + + + 0 + + + + + True + 6 + start + + + gtk-add + True + True + True + True + + + False + False + 0 + + + + + gtk-remove + True + False + True + True + True + + + False + False + 1 + + + + + gtk-edit + True + False + True + True + True + + + False + False + 2 + + + + + False + False + 1 + + + + + 1 + + + + + + + True + Startup Programs + + + False + + + + + True + 12 + vertical + 6 + + + _Automatically remember running applications when logging out + True + True + False + True + True + + + False + False + 0 + + + + + True + + + True + True + + + True + 4 + + + True + gtk-save + + + False + False + 0 + + + + + True + _Remember Currently Running Applications + True + + + 1 + + + + + + + False + False + 0 + + + + + False + False + 1 + + + + + 1 + + + + + True + Options + + + 1 + False + + + + + True + 6 + 3 + 2 + 12 + 6 + + + True + 12 + + + True + True + + + + 0 + + + + + Browse… + True + True + True + + + False + False + 1 + + + + + 1 + 2 + 1 + 2 + GTK_FILL + + + + + True + True + + + + 1 + 2 + 2 + 3 + GTK_FILL + + + + + True + True + + + + 1 + 2 + GTK_FILL + + + + + True + 0 + Comm_ent: + True + label2 + + + 2 + 3 + GTK_FILL + GTK_FILL + + + + + True + 0 + Co_mmand: + True + session_properties_command_entry + + + 1 + 2 + GTK_FILL + GTK_FILL + + + + + True + 0 + _Name: + True + session_properties_name_entry + + + GTK_FILL + GTK_FILL + + + + diff --git a/doc/man/gnome-session.1 b/doc/man/gnome-session.1 index bf9cf808..35c062c5 100644 --- a/doc/man/gnome-session.1 +++ b/doc/man/gnome-session.1 @@ -67,46 +67,48 @@ Name=GNOME RequiredComponents=gnome-shell;gnome-settings-daemon; .in .fi .PP The \fB.session\fP files are looked for in \fB$XDG_CONFIG_HOME/gnome-session/sessions\fP, \fB$XDG_CONFIG_DIRS/gnome-session/sessions\fP and \fB$XDG_DATA_DIRS/gnome-session/sessions\fP. .SH ENVIRONMENT \fIgnome-session\fP sets several environment variables for the use of its child processes: .PP .B SESSION_MANAGER .IP This variable is used by session-manager aware clients to contact gnome-session. .PP .B DISPLAY .IP This variable is set to the X display being used by \fIgnome-session\fP. Note that if the \fI--display\fP option is used this might be different from the setting of the environment variable when gnome-session is invoked. .SH FILES .PP .B $XDG_CONFIG_HOME/config/autostart .B $XDG_CONFIG_DIRS/config/autostart .B /usr/share/gnome/autostart .IP The applications defined in those directories will be started on login. +\fIgnome-session-properties(1)\fP can be used to easily configure them. .PP .B $XDG_CONFIG_HOME/gnome-session/sessions .B $XDG_CONFIG_DIRS/gnome-session/sessions .B $XDG_DATA_DIRS/gnome-session/sessions .IP These directories contain the \fB.session\fP files that can be used with the \fI--session\fP option. .PP .B $XDG_CONFIG_HOME/gnome-session/saved-session .IP This directory contains the list of applications of the saved session. .SH BUGS If you find bugs in the \fIgnome-session\fP program, please report these on https://bugzilla.gnome.org. .SH SEE ALSO +.BR gnome-session-properties(1) .BR gnome-session-quit(1) diff --git a/po/POTFILES.in b/po/POTFILES.in index 63faf7d7..f32040fc 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,18 +1,19 @@ # List of source files containing translatable strings. # Please keep this file sorted alphabetically. data/gnome-custom-session.desktop.in data/gnome.desktop.in data/gnome-xorg.desktop.in data/gnome-dummy.session.desktop.in.in data/gnome.session.desktop.in.in data/session-selector.ui +data/session-properties.ui gnome-session/gsm-fail-whale-dialog.c gnome-session/gsm-manager.c gnome-session/gsm-process-helper.c gnome-session/gsm-util.c gnome-session/gsm-xsmp-client.c gnome-session/gsm-xsmp-server.c gnome-session/main.c tools/gnome-session-inhibit.c tools/gnome-session-selector.c tools/gnome-session-quit.c -- 2.17.0