private const int WINDOW_WIDTH = 400;
private const int WINDOW_HEIGHT = 500;
+ private UIManager ui_manager = new UIManager();
private Entry search_entry;
private VBox vbox_rigth;
private CustomVBox custom_vbox;
private IdentitiesManager identities_manager;
- private MoonshotServer dbus_server;
+ private MoonshotServer ipc_server;
public IdCardWidget selected_id_card_widget;
- private SourceFunc callback;
+ private Queue<IdentityRequest> request_queue;
private enum Columns
{
N_COLUMNS
}
+ private const string layout =
+"
+<menubar name='MenuBar'>
+ <menu name='FileMenu' action='FileMenuAction'>
+ <menuitem name='AddIdCard' action='AddIdCardAction' />
+ <separator />
+ <menuitem name='Quit' action='QuitAction' />
+ </menu>
+
+ <menu name='HelpMenu' action='HelpMenuAction'>
+ <menuitem name='About' action='AboutAction' />
+ </menu>
+</menubar>
+";
+
public MainWindow()
{
+ request_queue = new Queue<IdentityRequest>();
+
this.title = "Moonshoot";
- this.position = WindowPosition.CENTER;
+ this.set_position (WindowPosition.CENTER);
set_default_size (WINDOW_WIDTH, WINDOW_HEIGHT);
build_ui();
load_gss_eap_id_file();
//load_id_cards();
connect_signals();
- init_dbus_server();
+ init_ipc_server();
}
private bool visible_func (TreeModel model, TreeIter iter)
id_card.issuer = "Issuer";
id_card.username = dialog.username;
id_card.password = dialog.password;
-
- var icon_theme = IconTheme.get_default ();
- try
- {
- id_card.pixbuf = icon_theme.load_icon ("avatar-default",
- 48,
- IconLookupFlags.FORCE_SIZE);
- }
- catch (Error e)
- {
- id_card.pixbuf = null;
- stdout.printf("Error: %s\n", e.message);
- }
-
+ id_card.nai = id_card.username + "@" + id_card.issuer;
+ id_card.pixbuf = find_icon ("avatar-default", 48);
id_card.services = {"email","jabber","irc"};
return id_card;
dialog.destroy ();
}
- public void set_callback (SourceFunc callback)
+ public void select_identity (IdentityRequest request)
{
- this.callback = callback;
+ /* Automatic service matching rules can go here */
+
+ /* Resort to manual selection */
+ this.request_queue.push_tail (request);
+ this.show ();
}
public void send_identity_cb (IdCardWidget id_card_widget)
{
+ var request = this.request_queue.pop_head ();
+ var identity = id_card_widget.id_card;
this.selected_id_card_widget = id_card_widget;
- this.callback ();
+
+ if (identity.password == null)
+ {
+ var dialog = new AddPasswordDialog ();
+ var result = dialog.run ();
+
+ switch (result) {
+ case ResponseType.OK:
+ identity.password = dialog.password;
+ break;
+ default:
+ identity = null;
+ break;
+ }
+
+ dialog.destroy ();
+ }
+
+ if (this.request_queue.is_empty())
+ this.hide ();
+
+ request.return_identity (identity);
}
private void label_make_bold (Label label)
foreach (string service in id_card.services)
{
var label = new Label (service);
+ label.set_alignment (0, (float) 0.5);
#if VALA_0_12
var remove_button = new Button.from_stock (Stock.REMOVE);
#else
this.services_internal_vbox.show_all ();
}
+ private void on_about_action ()
+ {
+ string[] authors = {
+ "Javier Jardón <jjardon@codethink.co.uk>",
+ "Sam Thursfield <samthursfield@codethink.co.uk>",
+ null
+ };
+
+ string copyright = "Copyright 2011 JANET";
+
+ string license =
+"""
+Copyright (c) 2011, JANET(UK)
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+3. Neither the name of JANET(UK) nor the names of its contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
+""";
+
+ Gtk.show_about_dialog (this,
+ "comments", _("Moonshot project UI"),
+ "copyright", copyright,
+ "website", "http://www.project-moonshot.org/",
+ "license", license,
+ "website-label", _("Visit the Moonshot project web site"),
+ "authors", authors,
+ "translator-credits", _("translator-credits"),
+ null
+ );
+ }
+
+ private Gtk.ActionEntry[] create_actions() {
+ Gtk.ActionEntry[] actions = new Gtk.ActionEntry[0];
+
+ Gtk.ActionEntry filemenu = { "FileMenuAction",
+ null,
+ N_("_File"),
+ null, null, null };
+ actions += filemenu;
+ Gtk.ActionEntry add = { "AddIdCardAction",
+#if VALA_0_12
+ Stock.ADD,
+#else
+ STOCK_ADD,
+#endif
+ N_("Add ID Card"),
+ null,
+ N_("Add a new ID Card"),
+ add_identity_cb };
+ actions += add;
+ Gtk.ActionEntry quit = { "QuitAction",
+#if VALA_0_12
+ Stock.QUIT,
+#else
+ STOCK_QUIT,
+#endif
+ N_("Quit"),
+ "<control>Q",
+ N_("Quit the application"),
+ Gtk.main_quit };
+ actions += quit;
+
+ Gtk.ActionEntry helpmenu = { "HelpMenuAction",
+ null,
+ N_("_Help"),
+ null, null, null };
+ actions += helpmenu;
+ Gtk.ActionEntry about = { "AboutAction",
+#if VALA_0_12
+ Stock.ABOUT,
+#else
+ STOCK_ABOUT,
+#endif
+ N_("About"),
+ null,
+ N_("About this application"),
+ on_about_action };
+ actions += about;
+
+ return actions;
+ }
+
+
+ private void create_ui_manager ()
+ {
+ Gtk.ActionGroup action_group = new Gtk.ActionGroup ("GeneralActionGroup");
+ action_group.add_actions (create_actions (), this);
+ ui_manager.insert_action_group (action_group, 0);
+ try
+ {
+ ui_manager.add_ui_from_string (layout, -1);
+ }
+ catch (Error e)
+ {
+ stderr.printf ("%s\n", e.message);
+ }
+ ui_manager.ensure_update ();
+ }
+
private void build_ui()
{
+ create_ui_manager ();
+
this.search_entry = new Entry();
set_atk_name_description (search_entry, _("Search entry"), _("Search for a specific ID Card"));
- this.search_entry.set_icon_from_icon_name (EntryIconPosition.PRIMARY,
- "edit-find-symbolic");
- this.search_entry.set_icon_sensitive (EntryIconPosition.PRIMARY, false);
+ this.search_entry.set_icon_from_pixbuf (EntryIconPosition.PRIMARY,
+ find_icon_sized ("edit-find-symbolic", Gtk.IconSize.MENU));
this.search_entry.set_icon_tooltip_text (EntryIconPosition.PRIMARY,
_("Search identity or service"));
+ this.search_entry.set_icon_sensitive (EntryIconPosition.PRIMARY, false);
- this.search_entry.set_icon_from_icon_name (EntryIconPosition.SECONDARY,
- "edit-clear-symbolic");
- this.search_entry.set_icon_sensitive (EntryIconPosition.SECONDARY, false);
+ this.search_entry.set_icon_from_pixbuf (EntryIconPosition.SECONDARY,
+ find_icon_sized ("edit-clear-symbolic", Gtk.IconSize.MENU));
this.search_entry.set_icon_tooltip_text (EntryIconPosition.SECONDARY,
_("Clear the current search"));
+ this.search_entry.set_icon_sensitive (EntryIconPosition.SECONDARY, false);
+
this.search_entry.icon_press.connect (search_entry_icon_press_cb);
this.search_entry.notify["text"].connect (search_entry_text_changed_cb);
scroll.set_shadow_type (ShadowType.IN);
scroll.add_with_viewport (viewport);
- var button_add = new ToolButton (null, null);
- button_add.set_icon_name ("list-add-symbolic");
- set_atk_name_description (button_add, _("Add"), _("Add new ID Card"));
- button_add.clicked.connect (add_identity_cb);
- var button_toolbar = new Toolbar ();
- button_toolbar.insert (button_add, 0);
-
var vbox_left = new VBox (false, 0);
vbox_left.pack_start (search_entry, false, false, 6);
vbox_left.pack_start (scroll, true, true, 0);
- vbox_left.pack_start (button_toolbar, false, false, 0);
vbox_left.set_size_request (WINDOW_WIDTH, 0);
var login_vbox_title = new Label (_("Login: "));
hbox.pack_start (vbox_left, false, false, 0);
hbox.pack_start (vbox_rigth, false, false, 0);
- var main_vbox = new VBox (false, 12);
- main_vbox.pack_start (hbox, true, true, 0);
+ var main_vbox = new VBox (false, 0);
main_vbox.set_border_width (12);
+ var menubar = this.ui_manager.get_widget ("/MenuBar");
+ main_vbox.pack_start (menubar, false, false, 0);
+ main_vbox.pack_start (hbox, true, true, 0);
add (main_vbox);
main_vbox.show_all();
this.destroy.connect (Gtk.main_quit);
}
- private void init_dbus_server ()
+ private void init_ipc_server ()
{
+#if IPC_MSRPC
+ /* Errors will currently be sent via g_log - ie. to an
+ * obtrusive message box, on Windows
+ */
+ this.ipc_server = MoonshotServer.get_instance ();
+ MoonshotServer.start (this);
+#else
try {
var conn = DBus.Bus.get (DBus.BusType.SESSION);
dynamic DBus.Object bus = conn.get_object ("org.freedesktop.DBus",
uint reply = bus.request_name ("org.janet.Moonshot", (uint) 0);
assert (reply == DBus.RequestNameReply.PRIMARY_OWNER);
- this.dbus_server = new MoonshotServer (this);
- conn.register_object ("/org/janet/moonshot", dbus_server);
+ this.ipc_server = new MoonshotServer (this);
+ conn.register_object ("/org/janet/moonshot", ipc_server);
}
catch (DBus.Error e)
{
stderr.printf ("%s\n", e.message);
}
+#endif
}
public static int main(string[] args)
{
Gtk.init(ref args);
+#if OS_WIN32
+ // Force specific theme settings on Windows without requiring a gtkrc file
+ Gtk.Settings settings = Gtk.Settings.get_default ();
+ settings.set_string_property ("gtk-theme-name", "ms-windows", "moonshot");
+ settings.set_long_property ("gtk-menu-images", 0, "moonshot");
+#endif
+
Intl.bindtextdomain (Config.GETTEXT_PACKAGE, Config.LOCALEDIR);
Intl.bind_textdomain_codeset (Config.GETTEXT_PACKAGE, "UTF-8");
Intl.textdomain (Config.GETTEXT_PACKAGE);
projects / moonshot-ui.git / blobdiff