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

Proposed by Lance Andersen
Status: Approved
Approved by: Lance Andersen
Approved revision: 7
Proposed branch: lp:~lacovima/poweradmin/quickly_trunk
Merge into: lp:poweradmin
Diff against target: 276 lines (+127/-34)
7 files modified
data/ui/AboutPowerAdminDialog.ui (+1/-1)
data/ui/PowerAdminWindow.ui (+40/-16)
debian/changelog (+13/-0)
debian/control (+1/-0)
po/power-admin.pot (+5/-16)
power_admin/indicator.py (+66/-0)
setup.py (+1/-1)
To merge this branch: bzr merge lp:~lacovima/poweradmin/quickly_trunk
Reviewer Review Type Date Requested Status
Lance Andersen Approve
Review via email: mp+47120@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Lance Andersen (lacovima) :
review: Approve
4. By Lance Andersen

removed main window default content

5. By Lance Andersen

quickly saved

6. By Lance Andersen

commit before release

7. By Lance Andersen

quickly released: 11.01.1

Revision history for this message
Lance Andersen (lacovima) :
review: Approve

Unmerged revisions

7. By Lance Andersen

quickly released: 11.01.1

6. By Lance Andersen

commit before release

5. By Lance Andersen

quickly saved

4. By Lance Andersen

removed main window default content

3. By Lance Andersen

code move

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/ui/AboutPowerAdminDialog.ui'
2--- data/ui/AboutPowerAdminDialog.ui 2011-01-21 21:05:24 +0000
3+++ data/ui/AboutPowerAdminDialog.ui 2011-01-21 23:23:13 +0000
4@@ -8,7 +8,7 @@
5 <property name="type_hint">normal</property>
6 <property name="has_separator">False</property>
7 <property name="program_name">Power Admin</property>
8- <property name="version">11.01</property>
9+ <property name="version">11.01.1</property>
10 <property name="copyright">Copyright (C) 2011 Lance Andersen &lt;techlance@gmail.com&gt;</property>
11 <property name="website">https://launchpad.net/poweradmin</property>
12 <property name="license"># Copyright (C) 2011 Lance Andersen &lt;techlance@gmail.com&gt;
13
14=== modified file 'data/ui/PowerAdminWindow.ui'
15--- data/ui/PowerAdminWindow.ui 2011-01-21 21:05:24 +0000
16+++ data/ui/PowerAdminWindow.ui 2011-01-21 23:23:13 +0000
17@@ -1,9 +1,10 @@
18-<?xml version="1.0"?>
19+<?xml version="1.0" encoding="UTF-8"?>
20 <interface>
21 <requires lib="gtk+" version="2.16"/>
22 <!-- interface-requires power_admin_window 1.0 -->
23 <!-- interface-naming-policy project-wide -->
24 <!-- interface-local-resource-path ../media -->
25+ <object class="GtkTreeStore" id="treestore1"/>
26 <object class="PowerAdminWindow" id="power_admin_window">
27 <property name="title" translatable="yes">Power Admin</property>
28 <property name="icon">../media/icon.png</property>
29@@ -11,7 +12,6 @@
30 <child>
31 <object class="GtkVBox" id="vbox1">
32 <property name="visible">True</property>
33- <property name="orientation">vertical</property>
34 <property name="spacing">5</property>
35 <child>
36 <object class="GtkMenuBar" id="menubar1">
37@@ -177,30 +177,54 @@
38 </packing>
39 </child>
40 <child>
41- <object class="GtkLabel" id="label1">
42+ <object class="GtkToolbar" id="toolbar1">
43 <property name="visible">True</property>
44- <property name="xpad">30</property>
45- <property name="ypad">5</property>
46- <property name="label" translatable="yes">Your application has been created!
47-
48-To start changing this user interface, run 'quickly design', which will open Glade so you can edit the default windows and dialogs.
49-
50-To change the behavior and edit the python code, run 'quickly edit', which will bring up a text editor.</property>
51- <property name="wrap">True</property>
52 </object>
53 <packing>
54+ <property name="expand">False</property>
55 <property name="position">1</property>
56 </packing>
57 </child>
58 <child>
59- <object class="GtkImage" id="image1">
60+ <object class="GtkHPaned" id="hpaned1">
61 <property name="visible">True</property>
62- <property name="xpad">5</property>
63- <property name="ypad">5</property>
64- <property name="pixbuf">../media/background.png</property>
65+ <property name="can_focus">True</property>
66+ <child>
67+ <object class="GtkScrolledWindow" id="scrolledwindow1">
68+ <property name="visible">True</property>
69+ <property name="can_focus">True</property>
70+ <property name="hscrollbar_policy">automatic</property>
71+ <property name="vscrollbar_policy">automatic</property>
72+ <child>
73+ <object class="GtkTreeView" id="treeview1">
74+ <property name="visible">True</property>
75+ <property name="can_focus">True</property>
76+ <property name="model">treestore1</property>
77+ </object>
78+ </child>
79+ </object>
80+ <packing>
81+ <property name="resize">False</property>
82+ <property name="shrink">True</property>
83+ </packing>
84+ </child>
85+ <child>
86+ <object class="GtkScrolledWindow" id="scrolledwindow2">
87+ <property name="visible">True</property>
88+ <property name="can_focus">True</property>
89+ <property name="hscrollbar_policy">automatic</property>
90+ <property name="vscrollbar_policy">automatic</property>
91+ <child>
92+ <placeholder/>
93+ </child>
94+ </object>
95+ <packing>
96+ <property name="resize">True</property>
97+ <property name="shrink">True</property>
98+ </packing>
99+ </child>
100 </object>
101 <packing>
102- <property name="padding">15</property>
103 <property name="position">2</property>
104 </packing>
105 </child>
106
107=== modified file 'debian/changelog'
108--- debian/changelog 2011-01-21 21:05:30 +0000
109+++ debian/changelog 2011-01-21 23:23:13 +0000
110@@ -1,3 +1,16 @@
111+power-admin (11.01.1) maverick; urgency=low
112+
113+ * removed main window default content
114+ * code move
115+
116+ -- Lance Andersen <techlance@gmail.com> Fri, 21 Jan 2011 16:20:22 -0700
117+
118+power-admin (11.01ubuntu1) maverick; urgency=low
119+
120+ *
121+
122+ -- lance <lance@maverick> Fri, 21 Jan 2011 16:19:52 -0700
123+
124 power-admin (11.01) maverick; urgency=low
125
126 * New release.
127
128=== modified file 'debian/control'
129--- debian/control 2011-01-21 21:05:30 +0000
130+++ debian/control 2011-01-21 23:23:13 +0000
131@@ -16,6 +16,7 @@
132 Depends: ${misc:Depends},
133 ${python:Depends},
134 python-gtk2,
135+ python-appindicator,
136 python-launchpad-integration,
137 python-distutils-extra,
138 desktopcouch
139
140=== modified file 'po/power-admin.pot'
141--- po/power-admin.pot 2011-01-21 21:05:24 +0000
142+++ po/power-admin.pot 2011-01-21 23:23:13 +0000
143@@ -8,7 +8,7 @@
144 msgstr ""
145 "Project-Id-Version: PACKAGE VERSION\n"
146 "Report-Msgid-Bugs-To: \n"
147-"POT-Creation-Date: 2011-01-21 13:40-0700\n"
148+"POT-Creation-Date: 2011-01-21 16:19-0700\n"
149 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
150 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
151 "Language-Team: LANGUAGE <LL@li.org>\n"
152@@ -25,7 +25,7 @@
153 msgid "PowerAdmin application"
154 msgstr ""
155
156-#: ../bin/power-admin.py:139
157+#: ../bin/power-admin.py:150
158 msgid "Show debug messages"
159 msgstr ""
160
161@@ -34,28 +34,17 @@
162 msgstr ""
163
164 #: ../data/ui/PowerAdminWindow.ui.h:3
165-msgid ""
166-"Your application has been created!\n"
167-"\n"
168-"To start changing this user interface, run 'quickly design', which will open "
169-"Glade so you can edit the default windows and dialogs.\n"
170-"\n"
171-"To change the behavior and edit the python code, run 'quickly edit', which "
172-"will bring up a text editor."
173-msgstr ""
174-
175-#: ../data/ui/PowerAdminWindow.ui.h:8
176 msgid "_Edit"
177 msgstr ""
178
179-#: ../data/ui/PowerAdminWindow.ui.h:9
180+#: ../data/ui/PowerAdminWindow.ui.h:4
181 msgid "_File"
182 msgstr ""
183
184-#: ../data/ui/PowerAdminWindow.ui.h:10
185+#: ../data/ui/PowerAdminWindow.ui.h:5
186 msgid "_Help"
187 msgstr ""
188
189-#: ../data/ui/PowerAdminWindow.ui.h:11
190+#: ../data/ui/PowerAdminWindow.ui.h:6
191 msgid "_View"
192 msgstr ""
193
194=== added file 'power_admin/indicator.py'
195--- power_admin/indicator.py 1970-01-01 00:00:00 +0000
196+++ power_admin/indicator.py 2011-01-21 23:23:13 +0000
197@@ -0,0 +1,66 @@
198+#!/usr/bin/python
199+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
200+### BEGIN LICENSE
201+# Copyright (C) 2011 Lance Andersen <techlance@gmail.com>
202+# This program is free software: you can redistribute it and/or modify it
203+# under the terms of the GNU General Public License version 3, as published
204+# by the Free Software Foundation.
205+#
206+# This program is distributed in the hope that it will be useful, but
207+# WITHOUT ANY WARRANTY; without even the implied warranties of
208+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
209+# PURPOSE. See the GNU General Public License for more details.
210+#
211+# You should have received a copy of the GNU General Public License along
212+# with this program. If not, see <http://www.gnu.org/licenses/>.
213+### END LICENSE
214+
215+"""Code to add AppIndicator."""
216+
217+import gtk
218+
219+from power_admin.helpers import get_media_file
220+
221+import gettext
222+from gettext import gettext as _
223+gettext.textdomain('power-admin')
224+
225+import appindicator
226+
227+class Indicator:
228+ def __init__(self,window):
229+ self.indicator = appindicator.Indicator('power-admin','distributor-logo',appindicator.CATEGORY_APPLICATION_STATUS)
230+ self.indicator.set_status(appindicator.STATUS_ACTIVE)
231+
232+ #Can use self.icon once appindicator python api supports custom icons.
233+ #icon = get_media_file("logo.png")
234+ #self.indicator.set_icon(icon)
235+
236+ #Uncomment and choose an icon for attention state.
237+ #self.indicator.set_attention_icon("ICON-NAME")
238+
239+ self.menu = gtk.Menu()
240+
241+ # Add items to Menu and connect signals.
242+ # Can access methods from bin/power_admin using window
243+
244+ #Adding preferences button
245+ #window represents the main Window object of your app
246+ self.preferences = gtk.MenuItem("Preferences")
247+ self.preferences.connect("activate",window.preferences)
248+ self.preferences.show()
249+ self.menu.append(self.preferences)
250+
251+ self.quit = gtk.MenuItem("Quit")
252+ self.quit.connect("activate",window.quit)
253+ self.quit.show()
254+ self.menu.append(self.quit)
255+
256+ # Add more items here
257+
258+ self.menu.show()
259+ self.indicator.set_menu(self.menu)
260+
261+def new_application_indicator(window):
262+ ind = Indicator(window)
263+ return ind.indicator
264
265=== modified file 'setup.py'
266--- setup.py 2011-01-21 21:05:24 +0000
267+++ setup.py 2011-01-21 23:23:13 +0000
268@@ -88,7 +88,7 @@
269
270 DistUtilsExtra.auto.setup(
271 name='power-admin',
272- version='11.01',
273+ version='11.01.1',
274 license='GPL-3',
275 author='Lance Andersen',
276 author_email='techlance@gmail.com',

Subscribers

People subscribed via source and target branches

to all changes: