Merge lp:~lacovima/poweradmin/quickly_trunk into lp:poweradmin

[Lance Andersen]

[Lance Andersen (lacovima)]

review: Approve

[lp:~lacovima/poweradmin/quickly_trunk]

4. By Lance Andersen on 2011-01-21

removed main window default content

5. By Lance Andersen on 2011-01-21

quickly saved

6. By Lance Andersen on 2011-01-21

commit before release

7. By Lance Andersen on 2011-01-21

quickly released: 11.01.1

[Lance Andersen (lacovima)]

review: Approve

Unmerged revisions

7. By Lance Andersen on 2011-01-21

quickly released: 11.01.1

6. By Lance Andersen on 2011-01-21

commit before release

5. By Lance Andersen on 2011-01-21

quickly saved

4. By Lance Andersen on 2011-01-21

removed main window default content

3. By Lance Andersen on 2011-01-21

code move

=== modified file 'data/ui/AboutPowerAdminDialog.ui'
--- data/ui/AboutPowerAdminDialog.ui	2011-01-21 21:05:24 +0000
+++ data/ui/AboutPowerAdminDialog.ui	2011-01-21 23:23:13 +0000
@@ -8,7 +8,7 @@
     <property name="type_hint">normal</property>
     <property name="has_separator">False</property>
     <property name="program_name">Power Admin</property>
-    <property name="version">11.01</property>
+    <property name="version">11.01.1</property>
     <property name="copyright">Copyright (C) 2011 Lance Andersen &lt;[e-mail]&gt;</property>
     <property name="website">https://launchpad.net/poweradmin</property>
     <property name="license"># Copyright (C) 2011 Lance Andersen &lt;[e-mail]&gt;
 
=== modified file 'data/ui/PowerAdminWindow.ui'
--- data/ui/PowerAdminWindow.ui	2011-01-21 21:05:24 +0000
+++ data/ui/PowerAdminWindow.ui	2011-01-21 23:23:13 +0000
@@ -1,9 +1,10 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <requires lib="gtk+" version="2.16"/>
   <!-- interface-requires power_admin_window 1.0 -->
   <!-- interface-naming-policy project-wide -->
   <!-- interface-local-resource-path ../media -->
+  <object class="GtkTreeStore" id="treestore1"/>
   <object class="PowerAdminWindow" id="power_admin_window">
     <property name="title" translatable="yes">Power Admin</property>
     <property name="icon">../media/icon.png</property>
@@ -11,7 +12,6 @@
     <child>
       <object class="GtkVBox" id="vbox1">
         <property name="visible">True</property>
-        <property name="orientation">vertical</property>
         <property name="spacing">5</property>
         <child>
           <object class="GtkMenuBar" id="menubar1">
@@ -177,30 +177,54 @@
           </packing>
         </child>
         <child>
-          <object class="GtkLabel" id="label1">
+          <object class="GtkToolbar" id="toolbar1">
             <property name="visible">True</property>
-            <property name="xpad">30</property>
-            <property name="ypad">5</property>
-            <property name="label" translatable="yes">Your application has been created!
-
-To start changing this user interface, run 'quickly design', which will open Glade so you can edit the default windows and dialogs.
-
-To change the behavior and edit the python code, run 'quickly edit', which will bring up a text editor.</property>
-            <property name="wrap">True</property>
           </object>
           <packing>
+            <property name="expand">False</property>
             <property name="position">1</property>
           </packing>
         </child>
         <child>
-          <object class="GtkImage" id="image1">
+          <object class="GtkHPaned" id="hpaned1">
             <property name="visible">True</property>
-            <property name="xpad">5</property>
-            <property name="ypad">5</property>
-            <property name="pixbuf">../media/background.png</property>
+            <property name="can_focus">True</property>
+            <child>
+              <object class="GtkScrolledWindow" id="scrolledwindow1">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="hscrollbar_policy">automatic</property>
+                <property name="vscrollbar_policy">automatic</property>
+                <child>
+                  <object class="GtkTreeView" id="treeview1">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="model">treestore1</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="resize">False</property>
+                <property name="shrink">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkScrolledWindow" id="scrolledwindow2">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="hscrollbar_policy">automatic</property>
+                <property name="vscrollbar_policy">automatic</property>
+                <child>
+                  <placeholder/>
+                </child>
+              </object>
+              <packing>
+                <property name="resize">True</property>
+                <property name="shrink">True</property>
+              </packing>
+            </child>
           </object>
           <packing>
-            <property name="padding">15</property>
             <property name="position">2</property>
           </packing>
         </child>
 
=== modified file 'debian/changelog'
--- debian/changelog	2011-01-21 21:05:30 +0000
+++ debian/changelog	2011-01-21 23:23:13 +0000
@@ -1,3 +1,16 @@
+power-admin (11.01.1) maverick; urgency=low
+
+  * removed main window default content
+  * code move
+
+ -- Lance Andersen <[e-mail]>  Fri, 21 Jan 2011 16:20:22 -0700
+
+power-admin (11.01ubuntu1) maverick; urgency=low
+
+  * 
+
+ -- lance <lance@maverick>  Fri, 21 Jan 2011 16:19:52 -0700
+
 power-admin (11.01) maverick; urgency=low
 
   * New release.
 
=== modified file 'debian/control'
--- debian/control	2011-01-21 21:05:30 +0000
+++ debian/control	2011-01-21 23:23:13 +0000
@@ -16,6 +16,7 @@
 Depends: ${misc:Depends},
  ${python:Depends},
  python-gtk2,
+ python-appindicator,
  python-launchpad-integration,
  python-distutils-extra,
  desktopcouch
 
=== modified file 'po/power-admin.pot'
--- po/power-admin.pot	2011-01-21 21:05:24 +0000
+++ po/power-admin.pot	2011-01-21 23:23:13 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-21 13:40-0700\n"
+"POT-Creation-Date: 2011-01-21 16:19-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -25,7 +25,7 @@
 msgid "PowerAdmin application"
 msgstr ""
 
-#: ../bin/power-admin.py:139
+#: ../bin/power-admin.py:150
 msgid "Show debug messages"
 msgstr ""
 
@@ -34,28 +34,17 @@
 msgstr ""
 
 #: ../data/ui/PowerAdminWindow.ui.h:3
-msgid ""
-"Your application has been created!\n"
-"\n"
-"To start changing this user interface, run 'quickly design', which will open "
-"Glade so you can edit the default windows and dialogs.\n"
-"\n"
-"To change the behavior and edit the python code, run 'quickly edit', which "
-"will bring up a text editor."
-msgstr ""
-
-#: ../data/ui/PowerAdminWindow.ui.h:8
 msgid "_Edit"
 msgstr ""
 
-#: ../data/ui/PowerAdminWindow.ui.h:9
+#: ../data/ui/PowerAdminWindow.ui.h:4
 msgid "_File"
 msgstr ""
 
-#: ../data/ui/PowerAdminWindow.ui.h:10
+#: ../data/ui/PowerAdminWindow.ui.h:5
 msgid "_Help"
 msgstr ""
 
-#: ../data/ui/PowerAdminWindow.ui.h:11
+#: ../data/ui/PowerAdminWindow.ui.h:6
 msgid "_View"
 msgstr ""
 
=== added file 'power_admin/indicator.py'
--- power_admin/indicator.py	1970-01-01 00:00:00 +0000
+++ power_admin/indicator.py	2011-01-21 23:23:13 +0000
@@ -0,0 +1,66 @@
+#!/usr/bin/python
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+### BEGIN LICENSE
+# Copyright (C) 2011 Lance Andersen <[e-mail]>
+# This program is free software: you can redistribute it and/or modify it 
+# under the terms of the GNU General Public License version 3, as published 
+# by the Free Software Foundation.
+# 
+# This program is distributed in the hope that it will be useful, but 
+# WITHOUT ANY WARRANTY; without even the implied warranties of 
+# MERCHANTABILITY, SATISFACTORY QUALITY, 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/>.
+### END LICENSE
+
+"""Code to add AppIndicator."""
+
+import gtk
+
+from power_admin.helpers import get_media_file
+
+import gettext
+from gettext import gettext as _
+gettext.textdomain('power-admin')
+
+import appindicator
+
+class Indicator:
+    def __init__(self,window):
+        self.indicator = appindicator.Indicator('power-admin','distributor-logo',appindicator.CATEGORY_APPLICATION_STATUS)
+        self.indicator.set_status(appindicator.STATUS_ACTIVE)
+    
+        #Can use self.icon once appindicator python api supports custom icons.
+        #icon = get_media_file("logo.png")
+        #self.indicator.set_icon(icon)
+ 
+        #Uncomment and choose an icon for attention state. 
+        #self.indicator.set_attention_icon("ICON-NAME")
+        
+        self.menu = gtk.Menu()
+
+        # Add items to Menu and connect signals. 
+        # Can access methods from bin/power_admin using window
+        
+        #Adding preferences button 
+        #window represents the main Window object of your app
+        self.preferences = gtk.MenuItem("Preferences")
+        self.preferences.connect("activate",window.preferences)
+        self.preferences.show()
+        self.menu.append(self.preferences)
+
+        self.quit = gtk.MenuItem("Quit")
+        self.quit.connect("activate",window.quit)
+        self.quit.show()
+        self.menu.append(self.quit)
+
+        # Add more items here                           
+
+        self.menu.show()
+        self.indicator.set_menu(self.menu)
+    
+def new_application_indicator(window):
+    ind = Indicator(window)
+    return ind.indicator
 
=== modified file 'setup.py'
--- setup.py	2011-01-21 21:05:24 +0000
+++ setup.py	2011-01-21 23:23:13 +0000
@@ -88,7 +88,7 @@
 
 DistUtilsExtra.auto.setup(
     name='power-admin',
-    version='11.01',
+    version='11.01.1',
     license='GPL-3',
     author='Lance Andersen',
     author_email='[e-mail]',