GNOME.org
 

[accounts-dialog/control-center-panel: 1/15] Initial port to a control-center panel

commit 78203781ca65a9930c37c073b2809e18163eb5cf
Author: Matthias Clasen <mclasen redhat com>
Date:   Sat Jun 12 21:22:04 2010 -0400

    Initial port to a control-center panel

 configure.ac                 |    7 ++++
 data/user-accounts-dialog.ui |   68 +++++++++++++-----------------------------
 src/Makefile.am              |   63 ++++++++++++++++++++++++++++++++++++++
 src/um-login-options.c       |   13 ++++++++
 src/um-photo-dialog.c        |    5 +--
 src/um-user.c                |    2 +-
 6 files changed, 107 insertions(+), 51 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index c27fafb..1236a12 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,8 +12,10 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([no])])
 
 AC_PROG_CC
+AC_PROG_CC_C_O
 PKG_PROG_PKG_CONFIG
 AM_GLIB_GNU_GETTEXT
+AM_PROG_LIBTOOL
 IT_PROG_INTLTOOL([0.40.0])
 AM_MAINTAINER_MODE
 
@@ -53,6 +55,11 @@ GNOME_COMPILE_WARNINGS([maximum])
 GNOME_CXX_WARNINGS
 GNOME_MAINTAINER_MODE_DEFINES
 
+PANELS_DIR="`$PKG_CONFIG --variable extensiondir libgnome-control-center`"
+AC_SUBST(PANELS_DIR)
+
+PKG_CHECK_MODULES(PANEL, libgnome-control-center)
+
 AC_CONFIG_HEADER([config.h])
 AC_CONFIG_FILES([
 Makefile
diff --git a/data/user-accounts-dialog.ui b/data/user-accounts-dialog.ui
index 606e238..4660cd4 100644
--- a/data/user-accounts-dialog.ui
+++ b/data/user-accounts-dialog.ui
@@ -57,12 +57,14 @@
         <child>
           <object class="GtkNotebook" id="top-level-notebook">
             <property name="visible">True</property>
-            <property name="show_tabs">False</property>
-            <property name="show_border">False</property>
+            <property name="show_tabs">True</property>
+            <property name="show_border">True</property>
+            <property name="border_width">5</property>
             <child>
               <object class="GtkHBox" id="hbox2">
                 <property name="visible">True</property>
                 <property name="spacing">12</property>
+                <property name="border_width">12</property>
                 <child>
                   <object class="GtkVBox" id="userlist-vbox">
                     <property name="visible">True</property>
@@ -720,27 +722,6 @@
                         <property name="position">0</property>
                       </packing>
                     </child>
-                    <child>
-                      <object class="GtkAlignment" id="alignment1">
-                        <property name="visible">True</property>
-                        <property name="xalign">1</property>
-                        <property name="yalign">1</property>
-                        <property name="xscale">0</property>
-                        <property name="yscale">0</property>
-                        <child>
-                          <object class="GtkToggleButton" id="login-options-button">
-                            <property name="label" translatable="yes">_Login Options</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">True</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
                   </object>
                   <packing>
                     <property name="position">1</property>
@@ -749,7 +730,14 @@
               </object>
             </child>
             <child type="tab">
-              <placeholder/>
+              <object class="GtkLabel" id="accounts-tab-label">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">Accounts</property>
+                <property name="justify">center</property>
+              </object>
+              <packing>
+                <property name="tab-fill">False</property>
+              </packing>
             </child>
             <child>
               <placeholder/>
@@ -762,6 +750,7 @@
                 <property name="visible">True</property>
                 <property name="orientation">vertical</property>
                 <property name="spacing">6</property>
+                <property name="border_width">12</property>
                 <child>
                   <object class="GtkHBox" id="hbox6">
                     <property name="visible">True</property>
@@ -894,28 +883,6 @@
                         <property name="position">0</property>
                       </packing>
                     </child>
-                    <child>
-                      <object class="GtkAlignment" id="alignment2">
-                        <property name="visible">True</property>
-                        <property name="xalign">1</property>
-                        <property name="yalign">1</property>
-                        <property name="xscale">0</property>
-                        <property name="yscale">0</property>
-                        <child>
-                          <object class="GtkToggleButton" id="user-list-button">
-                            <property name="label" translatable="yes">_Login Options</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">True</property>
-                            <property name="use_underline">True</property>
-                            <property name="active">True</property>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
                   </object>
                   <packing>
                     <property name="position">6</property>
@@ -927,7 +894,14 @@
               </packing>
             </child>
             <child type="tab">
-              <placeholder/>
+              <object class="GtkLabel" id="login-options-tab-label">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">Login Options</property>
+                <property name="justify">center</property>
+              </object>
+              <packing>
+                <property name="tab_fill">False</property>
+              </packing>
             </child>
             <child>
               <placeholder/>
diff --git a/src/Makefile.am b/src/Makefile.am
index ee97ec1..185bf19 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -73,3 +73,66 @@ marshal.c: fprintd-marshal.list
 EXTRA_DIST = \
 	locarchive.h \
 	fprintd-marshal.list
+
+ccpanelsdir = $(PANELS_DIR)
+ccpanels_LTLIBRARIES = libuser-properties.la
+
+libuser_properties_la_CFLAGS = 		\
+	$(PANEL_CFLAGS)
+
+libuser_properties_la_SOURCES = 	\
+	gdm-languages.h 		\
+	gdm-languages.c 		\
+	um-account-type.h		\
+	um-account-type.c 		\
+	um-user.h 			\
+	um-user.c 			\
+	um-user-manager.h 		\
+	um-user-manager.c 		\
+	um-account-dialog.h		\
+	um-account-dialog.c		\
+	um-language-dialog.h 		\
+	um-language-dialog.c		\
+	um-login-options.h		\
+	um-login-options.c		\
+	um-password-dialog.h		\
+	um-password-dialog.c		\
+	um-photo-dialog.h		\
+	um-photo-dialog.c		\
+	um-crop-area.h			\
+	um-crop-area.c			\
+	um-fingerprint-dialog.h		\
+	um-fingerprint-dialog.c		\
+	um-utils.h			\
+	um-utils.c			\
+	fingerprint-strings.h		\
+	um-strength-bar.h		\
+	um-strength-bar.c		\
+	run-passwd.h			\
+	run-passwd.c			\
+	$(MARSHALFILES)			\
+	um-user-panel.h 		\
+	um-user-panel.c			\
+	um-user-module.c
+
+libuser_properties_la_LIBADD = 		\
+	$(PANEL_LIBS)			\
+	$(GLIB_LIBS)			\
+	$(GIO_LIBS)			\
+	$(GTK_LIBS)			\
+	$(GNOME_DESKTOP_LIBS)		\
+	$(UNIQUE_LIBS)			\
+	$(POLKIT_LIBS)			\
+	$(CHEESE_LIBS)			\
+	$(DBUS_GLIB_LIBS)		\
+	$(GCONF_LIBS)			\
+	-lcrypt
+
+libuser_properties_la_LDFLAGS = -export_dynamic -avoid-version -module -no-undefined -export-symbols-regex '^g_io_module_(load|unload)'
+
+
+ INTLTOOL_DESKTOP_RULE@
+
+desktopdir = $(datadir)/applications
+Desktop_in_files = user-panel.desktop.in
+desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
diff --git a/src/um-login-options.c b/src/um-login-options.c
index 54c24e5..5330112 100644
--- a/src/um-login-options.c
+++ b/src/um-login-options.c
@@ -415,3 +415,16 @@ um_login_options_new (GtkBuilder *builder)
         return um;
 }
 
+void
+um_login_options_free (UmLoginOptions *um)
+{
+  if (um->manager)
+    g_object_unref (um->manager);
+  if (um->proxy)
+    g_object_unref (um->proxy);
+  if (um->connection)
+    g_object_unref (um->connection);
+
+  g_free (um);
+}
+
diff --git a/src/um-photo-dialog.c b/src/um-photo-dialog.c
index df501f8..e97f97d 100644
--- a/src/um-photo-dialog.c
+++ b/src/um-photo-dialog.c
@@ -407,7 +407,7 @@ setup_photo_popup (UmPhotoDialog *um)
         }
         g_dir_close (dir);
 
-        image = gtk_image_new_from_icon_name ("stock_person", GTK_ICON_SIZE_DIALOG);
+        image = gtk_image_new_from_icon_name ("avatar-default", GTK_ICON_SIZE_DIALOG);
         menuitem = gtk_menu_item_new ();
         gtk_container_add (GTK_CONTAINER (menuitem), image);
         gtk_widget_show_all (menuitem);
@@ -569,7 +569,6 @@ um_photo_dialog_free (UmPhotoDialog *um)
         if (um->monitor)
                 g_object_unref (um->monitor);
 #endif
-
         if (um->user)
                 g_object_unref (um->user);
 
@@ -660,7 +659,7 @@ um_photo_dialog_set_user (UmPhotoDialog *um,
                 list = um_user_manager_list_users (manager);
                 g_object_unref (manager);
 
-                icon = g_themed_icon_new ("stock_person");
+                icon = g_themed_icon_new ("avatar-default");
                 emblem = g_emblem_new (icon);
                 g_object_unref (icon);
 
diff --git a/src/um-user.c b/src/um-user.c
index 5b7bdf7..ce92b4e 100644
--- a/src/um-user.c
+++ b/src/um-user.c
@@ -587,7 +587,7 @@ um_user_render_icon (UmUser   *user,
         error = NULL;
         pixbuf = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (),
 
-                                           "stock_person",
+                                           "avatar-default",
                                            icon_size,
                                            GTK_ICON_LOOKUP_FORCE_SIZE,
                                            &error);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]