elementary/gala
1
1
Fork 0
mirror of https://github.com/elementary/gala.git synced 2024-10-26 16:01:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

Remove the EndSessionDialog

Browse Source 
As dialogs now use CSD we meet problems with decorations if we have the dialog spawned
inside gala since we're required to spawn POPUP type windows, which apparently won't get
decorated and, if forced to receive decorations, act weirdly.
This commit is contained in:
Tom Beckmann 2014-07-28 13:46:44 +02:00
parent 7f397dce91
commit ed50b232f5
7 changed files with 4 additions and 317 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/Makefile.am
View File

@ -9,7 +9,6 @@ libgala_doc_files = \
gala_doc_files = \
$(top_srcdir)/src/DBus.vala \
$(top_srcdir)/src/DragDropAction.vala \
$(top_srcdir)/src/EndSessionDialog.vala \
$(top_srcdir)/src/InternalUtils.vala \
$(top_srcdir)/src/Main.vala \
$(top_srcdir)/src/PluginManager.vala \

1
po/POTFILES.in
View File

@ -1,2 +1 @@
src/EndSessionDialog.vala
src/WindowManager.vala

1
po/POTFILES.skip
View File

@ -1,2 +1 @@
src/EndSessionDialog.c
src/WindowManager.c

43
po/gala.pot
View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-06-26 14:06+0200\n"
"POT-Creation-Date: 2014-07-28 13:31+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -17,49 +17,14 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
#: ../src/EndSessionDialog.vala:76
msgid "Are you sure you want to Log Out?"
msgstr ""
#: ../src/EndSessionDialog.vala:77
msgid "This will close all open applications."
msgstr ""
#: ../src/EndSessionDialog.vala:78
msgid "Log Out"
msgstr ""
#: ../src/EndSessionDialog.vala:83
msgid "Are you sure you want to Shut Down?"
msgstr ""
#: ../src/EndSessionDialog.vala:84
msgid "This will close all open applications and turn off this device."
msgstr ""
#: ../src/EndSessionDialog.vala:85
msgid "Shut Down"
msgstr ""
#. the indicator does not have a separate item for restart, that's
#. why we show both shutdown and restart for the restart action
#. (which is sent for shutdown as described above)
#: ../src/EndSessionDialog.vala:118
msgid "Restart"
msgstr ""
#: ../src/EndSessionDialog.vala:125
msgid "Cancel"
msgstr ""
#: ../src/WindowManager.vala:1107
#: ../src/WindowManager.vala:1157
msgid "Does the display look OK?"
msgstr ""
#: ../src/WindowManager.vala:1110
#: ../src/WindowManager.vala:1160
msgid "Keep This Configuration"
msgstr ""
#: ../src/WindowManager.vala:1111
#: ../src/WindowManager.vala:1161
msgid "Restore Previous Configuration"
msgstr ""

273
src/EndSessionDialog.vala
View File

@ -1,273 +0,0 @@
//
// Copyright (C) 2014 Tom Beckmann
//
// 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 3 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
//
// docs taken from unity indicator-session's
// src/backend-dbus/org.gnome.SessionManager.EndSessionDialog.xml
namespace Gala
{
enum EndSessionDialogType {
LOGOUT = 0,
SHUTDOWN = 1,
RESTART = 2
}
/**
* Private class wrapping most of the Gtk part of this dialog
*/
class Dialog : Gtk.Dialog
{
/**
* Confirm that logout has been clicked
*/
public signal void confirmed_logout ();
/**
* Confirm that reboot has been clicked
*/
public signal void confirmed_reboot ();
/**
* Confirm that shutdown has been clicked
*/
public signal void confirmed_shutdown ();
/**
* Type of the dialog. See constructor for more info.
*/
public EndSessionDialogType dialog_type { get; construct; }
/**
* Creates a new shutdown dialog
*
* @param type Set the type of this dialog. 0 creates a logout one,
* 1 creates a shutdown one and 2 will create a combined
* shutdown/reboot dialog.
*/
public Dialog (EndSessionDialogType type)
{
Object (type: Gtk.WindowType.POPUP, dialog_type: type);
}
construct
{
string icon_name, heading_text, button_text, content_text;
// the restart type is currently used by the indicator for what is
// labelled shutdown because of unity's implementation of it
// apparently. So we got to adjust to that until they fix this.
switch (dialog_type) {
case EndSessionDialogType.LOGOUT:
icon_name = "system-log-out";
heading_text = _("Are you sure you want to Log Out?");
content_text = _("This will close all open applications.");
button_text = _("Log Out");
break;
case EndSessionDialogType.SHUTDOWN:
case EndSessionDialogType.RESTART:
icon_name = "system-shutdown";
heading_text = _("Are you sure you want to Shut Down?");
content_text = _("This will close all open applications and turn off this device.");
button_text = _("Shut Down");
break;
/*case EndSessionDialogType.RESTART:
icon_name = "system-reboot";
heading_text = _("Are you sure you want to Restart?");
content_text = _("This will close all open applications.");
button_text = _("Restart");
break;*/
default:
warn_if_reached ();
break;
}
set_position (Gtk.WindowPosition.CENTER_ALWAYS);
var heading = new Gtk.Label ("<span weight='bold' size='larger'>" +
heading_text + "</span>");
heading.get_style_context ().add_class ("larger");
heading.use_markup = true;
heading.xalign = 0;
var grid = new Gtk.Grid ();
grid.column_spacing = 12;
grid.row_spacing = 12;
grid.margin_left = grid.margin_right = grid.margin_bottom = 12;
grid.attach (new Gtk.Image.from_icon_name (icon_name, Gtk.IconSize.DIALOG), 0, 0, 1, 2);
grid.attach (heading, 1, 0, 1, 1);
grid.attach (new Gtk.Label (content_text), 1, 1, 1, 1);
// the indicator does not have a separate item for restart, that's
// why we show both shutdown and restart for the restart action
// (which is sent for shutdown as described above)
if (dialog_type == EndSessionDialogType.RESTART) {
var confirm_restart = add_button (_("Restart"), Gtk.ResponseType.OK) as Gtk.Button;
confirm_restart.clicked.connect (() => {
confirmed_reboot ();
destroy ();
});
}
var cancel = add_button (_("Cancel"), Gtk.ResponseType.CANCEL) as Gtk.Button;
cancel.clicked.connect (() => { destroy (); });
var confirm = add_button (button_text, Gtk.ResponseType.OK) as Gtk.Button;
confirm.get_style_context ().add_class ("destructive-action");
confirm.clicked.connect (() => {
if (dialog_type == EndSessionDialogType.RESTART
|| dialog_type == EndSessionDialogType.SHUTDOWN)
confirmed_shutdown ();
else
confirmed_logout ();
destroy ();
});
set_default (confirm);
get_content_area ().add (grid);
var action_area = get_action_area ();
action_area.margin_right = 6;
action_area.margin_bottom = 6;
}
public override void map ()
{
base.map ();
Gdk.pointer_grab (get_window (), true, Gdk.EventMask.BUTTON_PRESS_MASK
| Gdk.EventMask.BUTTON_RELEASE_MASK
| Gdk.EventMask.POINTER_MOTION_MASK,
null, null, 0);
Gdk.keyboard_grab (get_window (), true, 0);
}
public override void destroy ()
{
Gdk.pointer_ungrab (0);
Gdk.keyboard_ungrab (0);
base.destroy ();
}
}
[DBus (name = "org.gnome.SessionManager.EndSessionDialog")]
public class EndSessionDialog : Clutter.Actor
{
/**
* Owns the Unity DBus and registers an instance of the EndSessionDialog
*
* @param wm The window manager
*/
[DBus (visible = false)]
public static void register (WindowManager wm)
{
Bus.own_name (BusType.SESSION, "com.canonical.Unity",
BusNameOwnerFlags.REPLACE, (connection) => {
connection.register_object ("/org/gnome/SessionManager/EndSessionDialog",
new EndSessionDialog (wm));
},
() => { },
() => { warning ("Could not acquire Unity bus."); });
}
/**
* Confirm that logout has been clicked
*/
public signal void confirmed_logout ();
/**
* Confirm that reboot has been clicked
*/
public signal void confirmed_reboot ();
/**
* Confirm that shutdown has been clicked
*/
public signal void confirmed_shutdown ();
/**
* The dialog has been cancelled
*/
public signal void canceled ();
/**
* The dialog has been closed
*/
public signal void closed ();
[DBus (visible = false)]
public WindowManager wm { get; construct; }
public EndSessionDialog (WindowManager wm)
{
Object (wm: wm);
}
construct
{
background_color = { 0, 0, 0, 255 };
opacity = 0;
add_constraint (new Clutter.BindConstraint (wm.stage, Clutter.BindCoordinate.SIZE, 0));
}
/**
* This function opens a dialog which asks the user for confirmation
* a logout, poweroff or reboot action. The dialog has a timeout
* after which the action is automatically taken, and it should show
* the inhibitors to the user.
*
* @param type The type of dialog to show.
* 0 for logout, 1 for shutdown, 2 for restart.
* @param timestamp Timestamp of the user-initiated event which
* triggered the call, or 0 if the call was not
* triggered by an event.
* @param seconds_to_stay_open The number of seconds which the dialog should
* stay open before automatic action is taken.
* @param inhibitor_object_paths The object paths of all inhibitors that
* are registered for the action.
*/
public void open (uint type, uint timestamp, uint seconds_to_stay_open,
ObjectPath[] inhibitor_object_paths) throws IOError
{
// note on the implementation: the unity indicator currently does not use
// the seconds_to_stay_open and inhibitor_object_paths parameters, so we
// ignore them here for now as well.
if (type > 2)
throw new IOError.INVALID_ARGUMENT ("Invalid type requested");
wm.ui_group.insert_child_below (this, wm.top_window_group);
animate (Clutter.AnimationMode.EASE_OUT_QUAD, 600, opacity: 80);
var dialog = new Dialog ((EndSessionDialogType) type);
dialog.show_all ();
dialog.destroy.connect (() => {
animate (Clutter.AnimationMode.EASE_OUT_QUAD, 400, opacity: 0)
.completed.connect (() => { wm.ui_group.remove_child (this); });
closed ();
});
dialog.confirmed_logout.connect (() => { confirmed_logout (); });
dialog.confirmed_shutdown.connect (() => { confirmed_shutdown (); });
dialog.confirmed_reboot.connect (() => { confirmed_reboot (); });
}
}
}

1
src/Makefile.am
View File

@ -33,7 +33,6 @@ gala_LDADD = \
gala_VALASOURCES = \
DBus.vala \
DragDropAction.vala \
EndSessionDialog.vala \
InternalUtils.vala \
Main.vala \
PluginManager.vala \

1
src/WindowManager.vala
View File

@ -72,7 +72,6 @@ namespace Gala
var screen = get_screen ();
DBus.init (this);
EndSessionDialog.register (this);
BackgroundCache.init (screen);
WindowListener.init (screen);