Merge lp:~ubuntujenkins/quickshot/quickshot-ui into lp:quickshot

Proposed by Luke Jennings
Status: Merged
Approved by: Luke Jennings
Approved revision: 248
Merge reported by: Luke Jennings
Merged at revision: not available
Proposed branch: lp:~ubuntujenkins/quickshot/quickshot-ui
Merge into: lp:quickshot
Diff against target: 2729 lines (+1422/-1054)
2 files modified
bin/quickshot (+56/-25)
data/ui/QuickshotWindow.ui (+1366/-1029)
To merge this branch: bzr merge lp:~ubuntujenkins/quickshot/quickshot-ui
Reviewer Review Type Date Requested Status
Luke Jennings Pending
Review via email: mp+28718@code.launchpad.net

Description of the change

new ui work started

To post a comment you must log in.
Revision history for this message
Luke Jennings (ubuntujenkins) wrote :

the main branch will be broken for a while the old version can be found in lp:quickshot/release

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/quickshot'
2--- bin/quickshot 2010-04-22 19:12:19 +0000
3+++ bin/quickshot 2010-06-29 11:22:25 +0000
4@@ -106,21 +106,27 @@
5 # again and again
6 get = self.builder.get_object
7
8- self.main = get("main")
9+ self.welcome = get("welcome")
10 self.usersetup = get("usersetup")
11- self.usersetup.labeltop = get("label5")
12- self.usersetup.label = get("label14")
13- self.usersetup.closebutton = get("closebutton")
14- self.usersetup.loginbutton = get("loginbutton")
15- self.usersetup.okbutton = get("okbutton")
16- self.usersetup.passwordentry = get("passwordentry")
17- self.usersetup.warningtext = get("label15")
18- self.usersetup.table1 = get("table1")
19- self.newuserwelcome = get("newuserwelcome")
20- self.screenshotinfo = get("screenshotinfo")
21- self.capture = get("capture")
22- self.nochange = get("nochange")
23- self.resolutionchange = get("Resolution Change")
24+ self.register_account = get("register_account")
25+ self.choose_screenshot = get("choose_screenshot")
26+ self.make_user_account = get("make_user_account")
27+ self.window1 = get("window1")
28+ self.screenshot_detail = get("screenshot_detail")
29+ self.window2 = get("window2")
30+ #self.usersetup.labeltop = get("label5")
31+ #self.usersetup.label = get("label14")
32+ # self.usersetup.closebutton = get("closebutton")
33+ #self.usersetup.loginbutton = get("loginbutton")
34+ #self.usersetup.okbutton = get("okbutton")
35+ #self.usersetup.passwordentry = get("passwordentry")
36+ #self.usersetup.warningtext = get("label15")
37+ #self.usersetup.table1 = get("table1")
38+ #self.newuserwelcome = get("newuserwelcome")
39+ #self.screenshotinfo = get("screenshotinfo")
40+ #self.capture = get("capture")
41+ #self.nochange = get("nochange")
42+ #self.resolutionchange = get("Resolution Change")
43 self.resolutionsuccess = get("Success")
44 self.capture_label = get("capture_label")
45 self.screenshotstore = get("screenshotstore")
46@@ -135,17 +141,17 @@
47 self.next_1 = get('next_1') #FIXME to remind us to decouple the OS from Quickshot for the next release.
48
49 #Avoid putting the user in a situation where the step-list is unfindable.
50- self.capture.set_keep_above(True)
51+ #self.capture.set_keep_above(True)
52
53- get("languagelabel").set_text(self.get_active_language()[1])
54- if os.environ["USER"] == "quickshot":
55- self.builder.get_object('label1').set_text(''.join((
56- "Welcome, Quickshot user. ",
57- "You will soon be ready to start taking screenshots.\n\n",
58- "Click the \"Next\" button to continue."
59- )))
60- self.screenshotdetails = {}
61- self.screenshots = None
62+ #get("languagelabel").set_text(self.get_active_language()[1])
63+ #if os.environ["USER"] == "quickshot":
64+ # self.builder.get_object('label1').set_text(''.join((
65+ # "Welcome, Quickshot user. ",
66+ # "You will soon be ready to start taking screenshots.\n\n",
67+ # "Click the \"Next\" button to continue."
68+ # )))
69+ #self.screenshotdetails = {}
70+ #self.screenshots = None
71
72 if not options.development_mode:
73 p = subprocess.Popen(['lsb_release', '-r'], stdout=subprocess.PIPE)
74@@ -156,6 +162,31 @@
75 subprocess.Popen(['sensible-browser', 'https://wiki.ubuntu.com/ubuntu-manual/quickshot/getquickshot'])
76
77
78+
79+
80+ def forward_btn_welcome(self, button, data=None):
81+ #self.register_account.show()
82+ #self.choose_screenshot.show()
83+ #self.make_user_account.show()
84+ #self.window1.show()
85+ #self.screenshot_detail.show()
86+ self.window2.show()
87+
88+
89+
90+
91+
92+
93+
94+
95+
96+
97+
98+
99+
100+
101+
102+
103 def about(self, widget, data=None):
104 """about - display the about box for quickshot """
105 logging.getLogger().debug('Displaying About dialog')
106@@ -651,7 +682,7 @@
107
108 builder = gtk.Builder()
109 builder.add_from_file(ui_filename)
110- window = builder.get_object("main")
111+ window = builder.get_object("welcome")
112 window.finish_initializing(builder)
113 return window
114
115
116=== modified file 'data/ui/QuickshotWindow.ui'
117--- data/ui/QuickshotWindow.ui 2010-03-31 20:12:14 +0000
118+++ data/ui/QuickshotWindow.ui 2010-06-29 11:22:25 +0000
119@@ -4,10 +4,10 @@
120 <!-- interface-requires quickshot_window 1.0 -->
121 <!-- interface-naming-policy project-wide -->
122 <!-- interface-local-resource-path ../media -->
123- <object class="QuickshotWindow" id="main">
124- <property name="width_request">600</property>
125- <property name="height_request">350</property>
126- <property name="title" translatable="yes">Quickshot</property>
127+ <object class="QuickshotWindow" id="welcome">
128+ <property name="width_request">580</property>
129+ <property name="height_request">400</property>
130+ <property name="title" translatable="yes">Quickshot - Welcome</property>
131 <property name="role">main</property>
132 <property name="resizable">False</property>
133 <property name="window_position">center</property>
134@@ -16,14 +16,13 @@
135 <property name="icon">../media/icon.png</property>
136 <signal name="destroy" handler="on_destroy"/>
137 <child>
138- <object class="GtkVBox" id="vbox1">
139+ <object class="GtkVBox" id="welcome_vbox_1">
140 <property name="visible">True</property>
141- <property name="spacing">5</property>
142 <child>
143- <object class="GtkMenuBar" id="menubar1">
144+ <object class="GtkMenuBar" id="welcome_menubar">
145 <property name="visible">True</property>
146 <child>
147- <object class="GtkMenuItem" id="menuitem1">
148+ <object class="GtkMenuItem" id="welcome_menu_itm_1">
149 <property name="visible">True</property>
150 <property name="label" translatable="yes">_File</property>
151 <property name="use_underline">True</property>
152@@ -31,13 +30,11 @@
153 <object class="GtkMenu" id="menu1">
154 <property name="visible">True</property>
155 <child>
156- <object class="GtkImageMenuItem" id="imagemenuitem5">
157+ <object class="GtkImageMenuItem" id="imagemenuitem17">
158 <property name="label">gtk-quit</property>
159 <property name="visible">True</property>
160 <property name="use_underline">True</property>
161 <property name="use_stock">True</property>
162- <accelerator key="q" signal="activate" modifiers="GDK_CONTROL_MASK"/>
163- <signal name="activate" handler="quit"/>
164 </object>
165 </child>
166 </object>
167@@ -45,20 +42,19 @@
168 </object>
169 </child>
170 <child>
171- <object class="GtkMenuItem" id="menuitem4">
172+ <object class="GtkMenuItem" id="menuitem16">
173 <property name="visible">True</property>
174 <property name="label" translatable="yes">_Help</property>
175 <property name="use_underline">True</property>
176 <child type="submenu">
177- <object class="GtkMenu" id="menu3">
178+ <object class="GtkMenu" id="menu15">
179 <property name="visible">True</property>
180 <child>
181- <object class="GtkImageMenuItem" id="imagemenuitem10">
182+ <object class="GtkImageMenuItem" id="imagemenuitem22">
183 <property name="label">gtk-about</property>
184 <property name="visible">True</property>
185 <property name="use_underline">True</property>
186 <property name="use_stock">True</property>
187- <signal name="activate" handler="about"/>
188 </object>
189 </child>
190 </object>
191@@ -72,15 +68,19 @@
192 </packing>
193 </child>
194 <child>
195- <object class="GtkHBox" id="hbox2">
196+ <object class="GtkVBox" id="welcome_vbox_2">
197 <property name="visible">True</property>
198+ <property name="border_width">12</property>
199+ <property name="spacing">12</property>
200 <child>
201- <object class="GtkLabel" id="label1">
202+ <object class="GtkHBox" id="hbox6">
203 <property name="visible">True</property>
204- <property name="xalign">0</property>
205- <property name="xpad">10</property>
206- <property name="ypad">10</property>
207- <property name="label" translatable="yes">Welcome to Quickshot!
208+ <property name="spacing">12</property>
209+ <child>
210+ <object class="GtkLabel" id="label20">
211+ <property name="visible">True</property>
212+ <property name="xalign">0</property>
213+ <property name="label" translatable="yes">Welcome to Quickshot!
214
215 In the next few steps, Quickshot will help you set up your computer to take screenshots in your language, using a standard screen resolution.
216
217@@ -90,423 +90,422 @@
218
219 Click the "Next" button to continue.
220 </property>
221- <property name="use_markup">True</property>
222- <property name="wrap">True</property>
223+ <property name="wrap">True</property>
224+ <property name="width_chars">50</property>
225+ </object>
226+ <packing>
227+ <property name="position">0</property>
228+ </packing>
229+ </child>
230+ <child>
231+ <object class="GtkImage" id="welcome_qs_logo">
232+ <property name="visible">True</property>
233+ <property name="yalign">0</property>
234+ <property name="pixbuf">logo.png</property>
235+ </object>
236+ <packing>
237+ <property name="position">1</property>
238+ </packing>
239+ </child>
240 </object>
241 <packing>
242- <property name="padding">5</property>
243 <property name="position">0</property>
244 </packing>
245 </child>
246 <child>
247- <object class="GtkImage" id="image1">
248+ <object class="GtkHButtonBox" id="hbuttonbox7">
249 <property name="visible">True</property>
250- <property name="yalign">0</property>
251- <property name="pixbuf">logo.png</property>
252+ <property name="spacing">12</property>
253+ <property name="layout_style">end</property>
254+ <child>
255+ <object class="GtkButton" id="welcome_close_btn">
256+ <property name="label" translatable="yes">Close</property>
257+ <property name="visible">True</property>
258+ <property name="can_focus">True</property>
259+ <property name="receives_default">True</property>
260+ </object>
261+ <packing>
262+ <property name="expand">False</property>
263+ <property name="fill">False</property>
264+ <property name="padding">25</property>
265+ <property name="position">0</property>
266+ <property name="secondary">True</property>
267+ </packing>
268+ </child>
269+ <child>
270+ <object class="GtkButton" id="welcome_forward_btn">
271+ <property name="label" translatable="yes">Forward</property>
272+ <property name="visible">True</property>
273+ <property name="can_focus">True</property>
274+ <property name="receives_default">True</property>
275+ <signal name="clicked" handler="forward_btn_welcome"/>
276+ </object>
277+ <packing>
278+ <property name="expand">False</property>
279+ <property name="fill">False</property>
280+ <property name="pack_type">end</property>
281+ <property name="position">1</property>
282+ </packing>
283+ </child>
284 </object>
285 <packing>
286- <property name="padding">5</property>
287+ <property name="expand">False</property>
288 <property name="position">1</property>
289 </packing>
290 </child>
291 </object>
292 <packing>
293- <property name="expand">False</property>
294- <property name="padding">2</property>
295 <property name="position">1</property>
296 </packing>
297 </child>
298- <child>
299- <object class="GtkLabel" id="label3">
300- <property name="visible">True</property>
301- </object>
302- <packing>
303- <property name="position">2</property>
304- </packing>
305- </child>
306- <child>
307- <object class="GtkHBox" id="hbox1">
308- <property name="height_request">30</property>
309- <property name="visible">True</property>
310- <child>
311- <object class="GtkLabel" id="label2">
312- <property name="visible">True</property>
313- <property name="xalign">0.05000000074505806</property>
314- <property name="yalign">1</property>
315- <property name="label" translatable="yes">Quickshot version 0.0.8</property>
316- </object>
317- <packing>
318- <property name="padding">10</property>
319- <property name="position">0</property>
320- </packing>
321- </child>
322- <child>
323- <object class="GtkLabel" id="label13">
324- <property name="width_request">40</property>
325- <property name="visible">True</property>
326- </object>
327- <packing>
328- <property name="position">1</property>
329- </packing>
330- </child>
331- <child>
332- <object class="GtkButton" id="button1">
333- <property name="label" translatable="yes">Close</property>
334- <property name="width_request">10</property>
335- <property name="visible">True</property>
336- <property name="can_focus">True</property>
337- <property name="receives_default">True</property>
338- <property name="events">GDK_BUTTON_PRESS_MASK | GDK_STRUCTURE_MASK</property>
339- <signal name="clicked" handler="quit"/>
340- </object>
341- <packing>
342- <property name="padding">5</property>
343- <property name="position">2</property>
344- </packing>
345- </child>
346- <child>
347- <object class="GtkButton" id="next_1">
348- <property name="label" translatable="yes">Next</property>
349- <property name="width_request">10</property>
350- <property name="visible">True</property>
351- <property name="can_focus">True</property>
352- <property name="has_focus">True</property>
353- <property name="receives_default">True</property>
354- <property name="events">GDK_BUTTON_PRESS_MASK | GDK_STRUCTURE_MASK</property>
355- <property name="use_underline">True</property>
356- <signal name="clicked" handler="on_next_1_clicked"/>
357- </object>
358- <packing>
359- <property name="padding">5</property>
360- <property name="position">3</property>
361- </packing>
362- </child>
363- </object>
364- <packing>
365- <property name="expand">False</property>
366- <property name="fill">False</property>
367- <property name="padding">5</property>
368- <property name="position">3</property>
369- </packing>
370- </child>
371 </object>
372 </child>
373 </object>
374- <object class="GtkWindow" id="usersetup">
375- <property name="width_request">450</property>
376- <property name="height_request">250</property>
377- <property name="title" translatable="yes">Quickshot</property>
378+ <object class="GtkListStore" id="project_list">
379+ <columns>
380+ <!-- column-name Project -->
381+ <column type="gchararray"/>
382+ <!-- column-name Description -->
383+ <column type="gchararray"/>
384+ </columns>
385+ </object>
386+ <object class="GtkListStore" id="screenshotstore">
387+ <columns>
388+ <!-- column-name Name -->
389+ <column type="gchararray"/>
390+ <!-- column-name Status -->
391+ <column type="gchararray"/>
392+ </columns>
393+ </object>
394+ <object class="GtkWindow" id="register_account">
395 <property name="resizable">False</property>
396- <property name="window_position">center</property>
397- <property name="icon">../media/icon.png</property>
398- <property name="type_hint">dialog</property>
399- <property name="deletable">False</property>
400- <signal name="destroy" handler="on_destroy"/>
401+ <property name="default_width">250</property>
402+ <property name="default_height">100</property>
403 <child>
404 <object class="GtkVBox" id="vbox3">
405 <property name="visible">True</property>
406 <child>
407- <object class="GtkLabel" id="label5">
408+ <object class="GtkMenuBar" id="welcome_menubar2">
409 <property name="visible">True</property>
410- <property name="xalign">0</property>
411- <property name="xpad">25</property>
412- <property name="label" translatable="yes">Quickshot is now setting up your computer with a new user called "quickshot".</property>
413- <property name="use_markup">True</property>
414- <property name="wrap">True</property>
415+ <child>
416+ <object class="GtkMenuItem" id="menuitem2">
417+ <property name="visible">True</property>
418+ <property name="label" translatable="yes">_File</property>
419+ <property name="use_underline">True</property>
420+ <child type="submenu">
421+ <object class="GtkMenu" id="menu2">
422+ <property name="visible">True</property>
423+ <child>
424+ <object class="GtkImageMenuItem" id="imagemenuitem1">
425+ <property name="label">gtk-quit</property>
426+ <property name="visible">True</property>
427+ <property name="use_underline">True</property>
428+ <property name="use_stock">True</property>
429+ <accelerator key="q" signal="activate" modifiers="GDK_CONTROL_MASK"/>
430+ </object>
431+ </child>
432+ </object>
433+ </child>
434+ </object>
435+ </child>
436+ <child>
437+ <object class="GtkMenuItem" id="menuitem6">
438+ <property name="visible">True</property>
439+ <property name="label" translatable="yes">_Help</property>
440+ <property name="use_underline">True</property>
441+ <child type="submenu">
442+ <object class="GtkMenu" id="menu5">
443+ <property name="visible">True</property>
444+ <child>
445+ <object class="GtkImageMenuItem" id="imagemenuitem2">
446+ <property name="label">gtk-about</property>
447+ <property name="visible">True</property>
448+ <property name="use_underline">True</property>
449+ <property name="use_stock">True</property>
450+ </object>
451+ </child>
452+ </object>
453+ </child>
454+ </object>
455+ </child>
456 </object>
457 <packing>
458+ <property name="expand">False</property>
459 <property name="position">0</property>
460 </packing>
461 </child>
462 <child>
463- <object class="GtkVBox" id="vbox4">
464+ <object class="GtkVBox" id="vbox12">
465 <property name="visible">True</property>
466+ <property name="border_width">12</property>
467+ <property name="spacing">12</property>
468 <child>
469- <object class="GtkLabel" id="label14">
470+ <object class="GtkHBox" id="hbox8">
471 <property name="visible">True</property>
472- <property name="yalign">0.43000000715255737</property>
473- <property name="xpad">20</property>
474- <property name="label" translatable="yes">Please enter the password for the "quickshot" user in the box
475-below.
476-
477-&lt;b&gt;It is recommended that you do &lt;i&gt;not&lt;/i&gt; give this account
478-the same password as your main account!&lt;/b&gt;
479-</property>
480- <property name="use_markup">True</property>
481- <property name="wrap">True</property>
482+ <property name="spacing">12</property>
483+ <child>
484+ <object class="GtkVBox" id="vbox1">
485+ <property name="visible">True</property>
486+ <property name="spacing">12</property>
487+ <property name="homogeneous">True</property>
488+ <child>
489+ <object class="GtkLabel" id="label3">
490+ <property name="visible">True</property>
491+ <property name="xalign">0</property>
492+ <property name="label" translatable="yes">Name:</property>
493+ </object>
494+ <packing>
495+ <property name="position">0</property>
496+ </packing>
497+ </child>
498+ <child>
499+ <object class="GtkLabel" id="label5">
500+ <property name="visible">True</property>
501+ <property name="xalign">0</property>
502+ <property name="label" translatable="yes">E-mail:</property>
503+ </object>
504+ <packing>
505+ <property name="position">1</property>
506+ </packing>
507+ </child>
508+ <child>
509+ <object class="GtkLabel" id="label6">
510+ <property name="visible">True</property>
511+ <property name="label" translatable="yes">Confirm E-mail:</property>
512+ <property name="single_line_mode">True</property>
513+ </object>
514+ <packing>
515+ <property name="position">2</property>
516+ </packing>
517+ </child>
518+ </object>
519+ <packing>
520+ <property name="expand">False</property>
521+ <property name="position">0</property>
522+ </packing>
523+ </child>
524+ <child>
525+ <object class="GtkVBox" id="vbox4">
526+ <property name="width_request">60</property>
527+ <property name="visible">True</property>
528+ <property name="spacing">12</property>
529+ <property name="homogeneous">True</property>
530+ <child>
531+ <object class="GtkEntry" id="entry1">
532+ <property name="visible">True</property>
533+ <property name="can_focus">True</property>
534+ <property name="invisible_char">&#x25CF;</property>
535+ </object>
536+ <packing>
537+ <property name="expand">False</property>
538+ <property name="position">0</property>
539+ </packing>
540+ </child>
541+ <child>
542+ <object class="GtkEntry" id="entry2">
543+ <property name="visible">True</property>
544+ <property name="can_focus">True</property>
545+ <property name="invisible_char">&#x25CF;</property>
546+ </object>
547+ <packing>
548+ <property name="expand">False</property>
549+ <property name="position">1</property>
550+ </packing>
551+ </child>
552+ <child>
553+ <object class="GtkEntry" id="entry3">
554+ <property name="visible">True</property>
555+ <property name="can_focus">True</property>
556+ <property name="invisible_char">&#x25CF;</property>
557+ </object>
558+ <packing>
559+ <property name="expand">False</property>
560+ <property name="pack_type">end</property>
561+ <property name="position">2</property>
562+ </packing>
563+ </child>
564+ </object>
565+ <packing>
566+ <property name="position">1</property>
567+ </packing>
568+ </child>
569 </object>
570 <packing>
571+ <property name="padding">12</property>
572 <property name="position">0</property>
573 </packing>
574 </child>
575 <child>
576- <object class="GtkTable" id="table1">
577+ <object class="GtkCheckButton" id="checkbutton1">
578+ <property name="label" translatable="yes">I would like to be credited for my contribution</property>
579 <property name="visible">True</property>
580- <property name="n_rows">2</property>
581- <property name="n_columns">2</property>
582- <child>
583- <object class="GtkLabel" id="label6">
584- <property name="visible">True</property>
585- <property name="xalign">1</property>
586- <property name="xpad">5</property>
587- <property name="label" translatable="yes">Password:</property>
588- </object>
589- <packing>
590- <property name="top_attach">1</property>
591- <property name="bottom_attach">2</property>
592- </packing>
593- </child>
594- <child>
595- <object class="GtkEntry" id="passwordentry">
596- <property name="visible">True</property>
597- <property name="can_focus">True</property>
598- <property name="max_length">32</property>
599- <property name="visibility">False</property>
600- <property name="invisible_char">&#x2022;</property>
601- <property name="invisible_char_set">True</property>
602- <signal name="changed" handler="on_passwordentry_changed"/>
603- </object>
604- <packing>
605- <property name="left_attach">1</property>
606- <property name="right_attach">2</property>
607- <property name="top_attach">1</property>
608- <property name="bottom_attach">2</property>
609- <property name="x_options">GTK_EXPAND</property>
610- </packing>
611- </child>
612- <child>
613- <object class="GtkLabel" id="label15">
614- <property name="yalign">1</property>
615- <property name="label" translatable="yes">&lt;b&gt;Invalid password!&lt;/b&gt;</property>
616- <property name="use_markup">True</property>
617- </object>
618- <packing>
619- <property name="left_attach">1</property>
620- <property name="right_attach">2</property>
621- </packing>
622- </child>
623- <child>
624- <placeholder/>
625- </child>
626+ <property name="can_focus">True</property>
627+ <property name="receives_default">False</property>
628+ <property name="draw_indicator">True</property>
629 </object>
630 <packing>
631 <property name="position">1</property>
632 </packing>
633 </child>
634+ <child>
635+ <object class="GtkHButtonBox" id="hbuttonbox1">
636+ <property name="visible">True</property>
637+ <property name="spacing">12</property>
638+ <property name="layout_style">end</property>
639+ <child>
640+ <object class="GtkButton" id="button18">
641+ <property name="label" translatable="yes">Close</property>
642+ <property name="visible">True</property>
643+ <property name="can_focus">True</property>
644+ <property name="receives_default">True</property>
645+ </object>
646+ <packing>
647+ <property name="expand">False</property>
648+ <property name="fill">False</property>
649+ <property name="position">0</property>
650+ <property name="secondary">True</property>
651+ </packing>
652+ </child>
653+ <child>
654+ <object class="GtkButton" id="button19">
655+ <property name="label" translatable="yes">Previous</property>
656+ <property name="visible">True</property>
657+ <property name="can_focus">True</property>
658+ <property name="receives_default">True</property>
659+ </object>
660+ <packing>
661+ <property name="expand">False</property>
662+ <property name="fill">False</property>
663+ <property name="position">1</property>
664+ </packing>
665+ </child>
666+ <child>
667+ <object class="GtkButton" id="button17">
668+ <property name="label" translatable="yes">Next</property>
669+ <property name="visible">True</property>
670+ <property name="can_focus">True</property>
671+ <property name="receives_default">True</property>
672+ </object>
673+ <packing>
674+ <property name="expand">False</property>
675+ <property name="fill">False</property>
676+ <property name="pack_type">end</property>
677+ <property name="position">2</property>
678+ </packing>
679+ </child>
680+ </object>
681+ <packing>
682+ <property name="expand">False</property>
683+ <property name="position">2</property>
684+ </packing>
685+ </child>
686 </object>
687 <packing>
688+ <property name="padding">12</property>
689 <property name="position">1</property>
690 </packing>
691 </child>
692- <child>
693- <object class="GtkHButtonBox" id="hbuttonbox1">
694- <property name="visible">True</property>
695- <property name="spacing">5</property>
696- <property name="layout_style">center</property>
697- <child>
698- <object class="GtkButton" id="closebutton">
699- <property name="label">gtk-close</property>
700- <property name="visible">True</property>
701- <property name="can_focus">True</property>
702- <property name="receives_default">True</property>
703- <property name="use_stock">True</property>
704- <signal name="clicked" handler="on_destroy"/>
705- </object>
706- <packing>
707- <property name="expand">False</property>
708- <property name="fill">False</property>
709- <property name="position">0</property>
710- </packing>
711- </child>
712- <child>
713- <object class="GtkButton" id="loginbutton">
714- <property name="label" translatable="yes">Login</property>
715- <property name="can_focus">True</property>
716- <property name="has_focus">True</property>
717- <property name="receives_default">True</property>
718- <signal name="clicked" handler="on_loginbutton_clicked"/>
719- </object>
720- <packing>
721- <property name="expand">False</property>
722- <property name="fill">False</property>
723- <property name="position">1</property>
724- </packing>
725- </child>
726- <child>
727- <object class="GtkButton" id="okbutton">
728- <property name="label">gtk-ok</property>
729- <property name="visible">True</property>
730- <property name="sensitive">False</property>
731- <property name="can_focus">True</property>
732- <property name="has_focus">True</property>
733- <property name="receives_default">True</property>
734- <property name="use_stock">True</property>
735- <signal name="clicked" handler="on_okbutton_clicked"/>
736- </object>
737- <packing>
738- <property name="expand">False</property>
739- <property name="fill">False</property>
740- <property name="position">2</property>
741- </packing>
742- </child>
743- </object>
744- <packing>
745- <property name="position">2</property>
746- </packing>
747- </child>
748 </object>
749 </child>
750 </object>
751- <object class="GtkWindow" id="newuserwelcome">
752- <property name="width_request">200</property>
753- <property name="height_request">80</property>
754- <property name="title" translatable="yes">Quickshot</property>
755- <property name="window_position">center</property>
756- <property name="default_width">350</property>
757- <property name="default_height">300</property>
758- <property name="icon">../media/icon.png</property>
759+ <object class="GtkWindow" id="choose_screenshot">
760+ <property name="title" translatable="yes">Quickshot - Choose screenshot</property>
761+ <property name="default_width">800</property>
762+ <property name="default_height">500</property>
763 <child>
764- <object class="GtkLabel" id="label7">
765- <property name="visible">True</property>
766- <property name="xalign">0.43000000715255737</property>
767- <property name="xpad">20</property>
768- <property name="label" translatable="yes">Welcome to new "quickshot" user account.
769-
770-This account was created so that screenshots can be taken in a standard Ubuntu environment.
771-
772-At the moment, Quickshot is downloading the necessary data. This might take a few minutes the first time you run Quickshot.
773-
774-Please wait...</property>
775- <property name="wrap">True</property>
776- </object>
777- </child>
778- </object>
779- <object class="GtkListStore" id="screenshotstore">
780- <columns>
781- <!-- column-name name -->
782- <column type="gchararray"/>
783- <!-- column-name status -->
784- <column type="gchararray"/>
785- </columns>
786- </object>
787- <object class="GtkDialog" id="screenshotinfo">
788- <property name="border_width">5</property>
789- <property name="title" translatable="yes">Quickshot</property>
790- <property name="resizable">False</property>
791- <property name="window_position">center</property>
792- <property name="icon">../media/icon.png</property>
793- <property name="type_hint">normal</property>
794- <property name="has_separator">False</property>
795- <signal name="destroy" handler="on_destroy"/>
796- <signal name="show" handler="on_screenshotinfo_show"/>
797- <child internal-child="vbox">
798- <object class="GtkVBox" id="dialog-vbox2">
799- <property name="visible">True</property>
800- <property name="spacing">2</property>
801- <child>
802- <object class="GtkVBox" id="vbox2">
803- <property name="visible">True</property>
804- <child>
805- <object class="GtkHBox" id="hbox3">
806- <property name="visible">True</property>
807- <child>
808- <object class="GtkLabel" id="label4">
809- <property name="visible">True</property>
810- <property name="xpad">20</property>
811- <property name="ypad">20</property>
812- <property name="label" translatable="yes">
813-Below is a list of screenshots that are still needed for Getting Started with Ubuntu 10.04. Select a screenshot you would like to take and read the description so you know what the screenshot involves.
814-
815-If all the screenshots in your native language have been taken already, you can change your language by logging out, choosing a new language, and then logging in as "quickshot" again.
816- </property>
817- <property name="wrap">True</property>
818- </object>
819- <packing>
820- <property name="position">0</property>
821- </packing>
822- </child>
823- <child>
824- <object class="GtkImage" id="image2">
825- <property name="visible">True</property>
826- <property name="yalign">0</property>
827- <property name="xpad">5</property>
828- <property name="ypad">5</property>
829- <property name="pixbuf">logo.png</property>
830- </object>
831- <packing>
832- <property name="position">1</property>
833- </packing>
834- </child>
835+ <object class="GtkVBox" id="vbox5">
836+ <property name="visible">True</property>
837+ <child>
838+ <object class="GtkMenuBar" id="welcome_menubar3">
839+ <property name="visible">True</property>
840+ <child>
841+ <object class="GtkMenuItem" id="menuitem3">
842+ <property name="visible">True</property>
843+ <property name="label" translatable="yes">_File</property>
844+ <property name="use_underline">True</property>
845+ <child type="submenu">
846+ <object class="GtkMenu" id="menu4">
847+ <property name="visible">True</property>
848+ <child>
849+ <object class="GtkImageMenuItem" id="imagemenuitem3">
850+ <property name="label">gtk-quit</property>
851+ <property name="visible">True</property>
852+ <property name="use_underline">True</property>
853+ <property name="use_stock">True</property>
854+ <accelerator key="q" signal="activate" modifiers="GDK_CONTROL_MASK"/>
855+ </object>
856+ </child>
857+ </object>
858+ </child>
859+ </object>
860+ </child>
861+ <child>
862+ <object class="GtkMenuItem" id="menuitem5">
863+ <property name="visible">True</property>
864+ <property name="label" translatable="yes">_Help</property>
865+ <property name="use_underline">True</property>
866+ <child type="submenu">
867+ <object class="GtkMenu" id="menu6">
868+ <property name="visible">True</property>
869+ <child>
870+ <object class="GtkImageMenuItem" id="imagemenuitem4">
871+ <property name="label">gtk-about</property>
872+ <property name="visible">True</property>
873+ <property name="use_underline">True</property>
874+ <property name="use_stock">True</property>
875+ </object>
876+ </child>
877+ </object>
878+ </child>
879+ </object>
880+ </child>
881+ </object>
882+ <packing>
883+ <property name="expand">False</property>
884+ <property name="position">0</property>
885+ </packing>
886+ </child>
887+ <child>
888+ <object class="GtkVBox" id="vbox14">
889+ <property name="visible">True</property>
890+ <property name="border_width">12</property>
891+ <property name="spacing">12</property>
892+ <child>
893+ <object class="GtkLabel" id="label7">
894+ <property name="visible">True</property>
895+ <property name="xalign">0</property>
896+ <property name="label" translatable="yes">Choose a screenshot and a language and click next to see the steps to take the screenshot</property>
897+ <property name="wrap">True</property>
898+ <property name="width_chars">100</property>
899 </object>
900 <packing>
901+ <property name="expand">False</property>
902 <property name="position">0</property>
903 </packing>
904 </child>
905 <child>
906- <object class="GtkHBox" id="hbox4">
907- <property name="visible">True</property>
908- <child>
909- <object class="GtkLabel" id="label8">
910- <property name="visible">True</property>
911- <property name="xalign">0</property>
912- <property name="xpad">20</property>
913- <property name="ypad">5</property>
914- <property name="label" translatable="yes">Language:</property>
915- <property name="ellipsize">start</property>
916- </object>
917- <packing>
918- <property name="position">0</property>
919- </packing>
920- </child>
921- <child>
922- <object class="GtkLabel" id="languagelabel">
923- <property name="visible">True</property>
924- <property name="label" translatable="yes">label</property>
925- </object>
926- <packing>
927- <property name="position">1</property>
928- </packing>
929- </child>
930- </object>
931- <packing>
932- <property name="position">1</property>
933- </packing>
934- </child>
935- <child>
936- <object class="GtkVBox" id="vbox7">
937- <property name="visible">True</property>
938- <child>
939- <object class="GtkLabel" id="label11">
940- <property name="visible">True</property>
941- <property name="xalign">0</property>
942- <property name="xpad">20</property>
943- <property name="ypad">5</property>
944- <property name="label" translatable="yes">Screenshot:</property>
945- </object>
946- <packing>
947- <property name="position">0</property>
948- </packing>
949- </child>
950- <child>
951- <object class="GtkScrolledWindow" id="scrolledwindow3">
952+ <object class="GtkHBox" id="hbox10">
953+ <property name="visible">True</property>
954+ <property name="spacing">12</property>
955+ <property name="homogeneous">True</property>
956+ <child>
957+ <object class="GtkScrolledWindow" id="scrolledwindow1">
958 <property name="visible">True</property>
959 <property name="can_focus">True</property>
960 <property name="hscrollbar_policy">automatic</property>
961 <property name="vscrollbar_policy">automatic</property>
962 <child>
963- <object class="GtkTreeView" id="screenshottreeview">
964- <property name="height_request">200</property>
965+ <object class="GtkTreeView" id="screenshottreeview1">
966 <property name="visible">True</property>
967 <property name="can_focus">True</property>
968- <property name="model">screenshotstore</property>
969+ <property name="model">project_list</property>
970 <property name="headers_clickable">False</property>
971 <property name="search_column">0</property>
972- <signal name="cursor_changed" handler="on_screenshottreeview_cursor_changed"/>
973 <child>
974- <object class="GtkTreeViewColumn" id="name">
975+ <object class="GtkTreeViewColumn" id="name1">
976 <property name="title">Name</property>
977 <child>
978- <object class="GtkCellRendererText" id="cellrenderertext1"/>
979+ <object class="GtkCellRendererText" id="cellrenderertext3"/>
980 <attributes>
981 <attribute name="text">0</attribute>
982 </attributes>
983@@ -514,10 +513,10 @@
984 </object>
985 </child>
986 <child>
987- <object class="GtkTreeViewColumn" id="status">
988+ <object class="GtkTreeViewColumn" id="status1">
989 <property name="title">Status</property>
990 <child>
991- <object class="GtkCellRendererText" id="cellrenderertext2"/>
992+ <object class="GtkCellRendererText" id="cellrenderertext4"/>
993 <attributes>
994 <attribute name="text">1</attribute>
995 </attributes>
996@@ -528,710 +527,874 @@
997 </child>
998 </object>
999 <packing>
1000- <property name="position">1</property>
1001- </packing>
1002- </child>
1003- </object>
1004- <packing>
1005+ <property name="position">0</property>
1006+ </packing>
1007+ </child>
1008+ <child>
1009+ <object class="GtkLabel" id="label9">
1010+ <property name="visible">True</property>
1011+ <property name="label" translatable="yes">Screenshot description</property>
1012+ </object>
1013+ <packing>
1014+ <property name="position">1</property>
1015+ </packing>
1016+ </child>
1017+ </object>
1018+ <packing>
1019+ <property name="padding">6</property>
1020+ <property name="position">1</property>
1021+ </packing>
1022+ </child>
1023+ <child>
1024+ <object class="GtkHBox" id="hbox11">
1025+ <property name="visible">True</property>
1026+ <property name="spacing">12</property>
1027+ <child>
1028+ <object class="GtkLabel" id="label12">
1029+ <property name="visible">True</property>
1030+ <property name="xalign">0</property>
1031+ <property name="label" translatable="yes">Installed Langugaes:</property>
1032+ <property name="single_line_mode">True</property>
1033+ </object>
1034+ <packing>
1035+ <property name="expand">False</property>
1036+ <property name="position">0</property>
1037+ </packing>
1038+ </child>
1039+ <child>
1040+ <object class="GtkComboBox" id="combobox1">
1041+ <property name="width_request">150</property>
1042+ <property name="visible">True</property>
1043+ </object>
1044+ <packing>
1045+ <property name="expand">False</property>
1046+ <property name="position">1</property>
1047+ </packing>
1048+ </child>
1049+ </object>
1050+ <packing>
1051+ <property name="expand">False</property>
1052 <property name="position">2</property>
1053 </packing>
1054 </child>
1055 <child>
1056- <object class="GtkFrame" id="Screenshot Description:">
1057+ <object class="GtkHButtonBox" id="hbuttonbox3">
1058 <property name="visible">True</property>
1059- <property name="label_xalign">0</property>
1060- <property name="shadow_type">none</property>
1061- <child>
1062- <object class="GtkAlignment" id="alignment1">
1063- <property name="visible">True</property>
1064- <property name="left_padding">12</property>
1065- <child>
1066- <object class="GtkLabel" id="screenshotdesclabel">
1067- <property name="visible">True</property>
1068- <property name="xpad">20</property>
1069- <property name="ypad">20</property>
1070- <property name="wrap">True</property>
1071- </object>
1072- </child>
1073- </object>
1074- </child>
1075- <child type="label">
1076- <object class="GtkLabel" id="label">
1077- <property name="visible">True</property>
1078- <property name="label" translatable="yes">&lt;b&gt;Screenshot Description&lt;/b&gt;</property>
1079- <property name="use_markup">True</property>
1080- </object>
1081+ <property name="spacing">12</property>
1082+ <property name="layout_style">end</property>
1083+ <child>
1084+ <object class="GtkButton" id="button3">
1085+ <property name="label" translatable="yes">Close</property>
1086+ <property name="visible">True</property>
1087+ <property name="can_focus">True</property>
1088+ <property name="receives_default">True</property>
1089+ </object>
1090+ <packing>
1091+ <property name="expand">False</property>
1092+ <property name="fill">False</property>
1093+ <property name="position">0</property>
1094+ <property name="secondary">True</property>
1095+ </packing>
1096+ </child>
1097+ <child>
1098+ <object class="GtkButton" id="button4">
1099+ <property name="label" translatable="yes">Previous</property>
1100+ <property name="visible">True</property>
1101+ <property name="can_focus">True</property>
1102+ <property name="receives_default">True</property>
1103+ </object>
1104+ <packing>
1105+ <property name="expand">False</property>
1106+ <property name="fill">False</property>
1107+ <property name="position">1</property>
1108+ </packing>
1109+ </child>
1110+ <child>
1111+ <object class="GtkButton" id="button20">
1112+ <property name="label" translatable="yes">Next</property>
1113+ <property name="visible">True</property>
1114+ <property name="can_focus">True</property>
1115+ <property name="receives_default">True</property>
1116+ </object>
1117+ <packing>
1118+ <property name="expand">False</property>
1119+ <property name="fill">False</property>
1120+ <property name="pack_type">end</property>
1121+ <property name="position">2</property>
1122+ </packing>
1123 </child>
1124 </object>
1125 <packing>
1126- <property name="padding">11</property>
1127+ <property name="expand">False</property>
1128 <property name="position">3</property>
1129 </packing>
1130 </child>
1131- <child>
1132- <object class="GtkLabel" id="label10">
1133- <property name="visible">True</property>
1134- <property name="xalign">0</property>
1135- <property name="xpad">20</property>
1136- <property name="ypad">10</property>
1137- <property name="label" translatable="yes">When you are ready to capture the screenshot described above, click Next.</property>
1138- </object>
1139- <packing>
1140- <property name="position">4</property>
1141- </packing>
1142- </child>
1143- </object>
1144- <packing>
1145- <property name="position">1</property>
1146- </packing>
1147- </child>
1148- <child internal-child="action_area">
1149- <object class="GtkHButtonBox" id="dialog-action_area2">
1150- <property name="visible">True</property>
1151- <property name="layout_style">end</property>
1152- <child>
1153- <object class="GtkButton" id="button5">
1154- <property name="label" translatable="yes">Finish</property>
1155- <property name="visible">True</property>
1156- <property name="can_focus">True</property>
1157- <property name="receives_default">True</property>
1158- <signal name="clicked" handler="quit"/>
1159- </object>
1160- <packing>
1161- <property name="expand">False</property>
1162- <property name="fill">False</property>
1163- <property name="position">0</property>
1164- </packing>
1165- </child>
1166- <child>
1167- <object class="GtkButton" id="screenshotinfo_next_button">
1168- <property name="label" translatable="yes">Next</property>
1169- <property name="visible">True</property>
1170- <property name="can_focus">True</property>
1171- <property name="has_focus">True</property>
1172- <property name="receives_default">True</property>
1173- <signal name="clicked" handler="on_screenshotinfo_next_button_clicked"/>
1174- </object>
1175- <packing>
1176- <property name="expand">False</property>
1177- <property name="fill">False</property>
1178- <property name="position">1</property>
1179- </packing>
1180- </child>
1181- </object>
1182- <packing>
1183- <property name="expand">False</property>
1184- <property name="pack_type">end</property>
1185- <property name="position">0</property>
1186- </packing>
1187- </child>
1188- </object>
1189- </child>
1190- <action-widgets>
1191- <action-widget response="0">button5</action-widget>
1192- <action-widget response="0">screenshotinfo_next_button</action-widget>
1193- </action-widgets>
1194- </object>
1195- <object class="GtkDialog" id="capture">
1196- <property name="border_width">5</property>
1197- <property name="title" translatable="yes">Take screenshot</property>
1198- <property name="resizable">False</property>
1199- <property name="window_position">center</property>
1200- <property name="icon">../media/icon.png</property>
1201- <property name="type_hint">normal</property>
1202- <property name="deletable">False</property>
1203- <property name="has_separator">False</property>
1204- <signal name="destroy" handler="on_capture_back_button_clicked"/>
1205- <child internal-child="vbox">
1206- <object class="GtkVBox" id="dialog-vbox3">
1207- <property name="visible">True</property>
1208- <property name="spacing">2</property>
1209- <child>
1210- <object class="GtkLabel" id="capture_label">
1211- <property name="visible">True</property>
1212- <property name="xpad">10</property>
1213- <property name="ypad">10</property>
1214- <property name="label" translatable="yes">Click Capture to take the screenshot.</property>
1215- <property name="wrap">True</property>
1216- </object>
1217- <packing>
1218- <property name="position">1</property>
1219- </packing>
1220- </child>
1221- <child internal-child="action_area">
1222- <object class="GtkHButtonBox" id="dialog-action_area3">
1223- <property name="visible">True</property>
1224- <property name="layout_style">end</property>
1225- <child>
1226- <object class="GtkButton" id="capture_back_button">
1227- <property name="label" translatable="yes">Back</property>
1228- <property name="visible">True</property>
1229- <property name="can_focus">True</property>
1230- <property name="receives_default">True</property>
1231- <signal name="clicked" handler="on_capture_back_button_clicked"/>
1232- </object>
1233- <packing>
1234- <property name="expand">False</property>
1235- <property name="fill">False</property>
1236- <property name="position">0</property>
1237- </packing>
1238- </child>
1239- <child>
1240- <object class="GtkButton" id="capture_button">
1241- <property name="label" translatable="yes">Capture</property>
1242- <property name="visible">True</property>
1243- <property name="can_focus">True</property>
1244- <property name="has_focus">True</property>
1245- <property name="receives_default">True</property>
1246- <property name="xalign">0.49000000953674316</property>
1247- <property name="yalign">0.4699999988079071</property>
1248- <signal name="clicked" handler="on_capture_button_clicked"/>
1249- </object>
1250- <packing>
1251- <property name="expand">False</property>
1252- <property name="fill">False</property>
1253- <property name="position">1</property>
1254- </packing>
1255- </child>
1256- </object>
1257- <packing>
1258- <property name="expand">False</property>
1259- <property name="pack_type">end</property>
1260- <property name="position">0</property>
1261- </packing>
1262- </child>
1263- </object>
1264- </child>
1265- <action-widgets>
1266- <action-widget response="-6">capture_back_button</action-widget>
1267- <action-widget response="-5">capture_button</action-widget>
1268- </action-widgets>
1269- </object>
1270- <object class="GtkDialog" id="Resolution Change">
1271- <property name="width_request">550</property>
1272- <property name="height_request">185</property>
1273- <property name="border_width">5</property>
1274- <property name="title" translatable="yes">Quickshot</property>
1275- <property name="resizable">False</property>
1276- <property name="window_position">center</property>
1277- <property name="icon">../media/icon.png</property>
1278- <property name="type_hint">normal</property>
1279- <property name="has_separator">False</property>
1280- <signal name="destroy" handler="on_destroy"/>
1281- <child internal-child="vbox">
1282- <object class="GtkVBox" id="dialog-vbox5">
1283- <property name="visible">True</property>
1284- <property name="spacing">2</property>
1285- <child>
1286- <object class="GtkHBox" id="hbox5">
1287- <property name="visible">True</property>
1288- <child>
1289- <object class="GtkVBox" id="vbox11">
1290- <property name="visible">True</property>
1291- <child>
1292- <object class="GtkImage" id="image3">
1293- <property name="visible">True</property>
1294- <property name="stock">gtk-dialog-warning</property>
1295- <property name="icon-size">6</property>
1296- </object>
1297- <packing>
1298- <property name="expand">False</property>
1299- <property name="fill">False</property>
1300- <property name="position">0</property>
1301- </packing>
1302- </child>
1303- </object>
1304- <packing>
1305- <property name="position">0</property>
1306- </packing>
1307- </child>
1308- <child>
1309- <object class="GtkVBox" id="vbox10">
1310- <property name="visible">True</property>
1311- <child>
1312- <object class="GtkLabel" id="label16">
1313- <property name="visible">True</property>
1314- <property name="label" translatable="yes">&lt;b&gt;Note: your screen resolution is about to be changed. If unsuccessful, you will be logged out in 15 seconds.&lt;/b&gt;
1315-
1316-Please click "OK" to continue. </property>
1317- <property name="use_markup">True</property>
1318- <property name="wrap">True</property>
1319- </object>
1320- <packing>
1321- <property name="position">0</property>
1322- </packing>
1323- </child>
1324- </object>
1325- <packing>
1326- <property name="position">1</property>
1327- </packing>
1328- </child>
1329- </object>
1330- <packing>
1331- <property name="expand">False</property>
1332- <property name="padding">12</property>
1333- <property name="position">1</property>
1334- </packing>
1335- </child>
1336- <child internal-child="action_area">
1337- <object class="GtkHButtonBox" id="dialog-action_area5">
1338- <property name="visible">True</property>
1339- <property name="layout_style">end</property>
1340- <child>
1341- <object class="GtkButton" id="button2">
1342- <property name="label" translatable="yes">Skip</property>
1343- <property name="visible">True</property>
1344- <property name="can_focus">True</property>
1345- <property name="receives_default">True</property>
1346- <signal name="button_press_event" handler="on_skip_resolution_change"/>
1347- </object>
1348- <packing>
1349- <property name="expand">False</property>
1350- <property name="fill">False</property>
1351- <property name="position">0</property>
1352- </packing>
1353- </child>
1354- <child>
1355- <object class="GtkButton" id="changeres">
1356- <property name="label" translatable="yes">OK</property>
1357- <property name="visible">True</property>
1358- <property name="can_focus">True</property>
1359- <property name="has_focus">True</property>
1360- <property name="receives_default">True</property>
1361- <signal name="button_press_event" handler="on_ok_changeres"/>
1362- </object>
1363- <packing>
1364- <property name="expand">False</property>
1365- <property name="fill">False</property>
1366- <property name="position">1</property>
1367- </packing>
1368- </child>
1369- </object>
1370- <packing>
1371- <property name="expand">False</property>
1372- <property name="fill">False</property>
1373- <property name="pack_type">end</property>
1374- <property name="position">0</property>
1375- </packing>
1376- </child>
1377- </object>
1378- </child>
1379- <action-widgets>
1380- <action-widget response="0">button2</action-widget>
1381- <action-widget response="0">changeres</action-widget>
1382- </action-widgets>
1383- </object>
1384- <object class="GtkDialog" id="nochange">
1385- <property name="width_request">550</property>
1386- <property name="height_request">185</property>
1387- <property name="border_width">5</property>
1388- <property name="title" translatable="yes">Quickshot</property>
1389- <property name="resizable">False</property>
1390- <property name="window_position">center</property>
1391- <property name="icon">../media/icon.png</property>
1392- <property name="type_hint">normal</property>
1393- <property name="has_separator">False</property>
1394- <signal name="destroy" handler="on_destroy"/>
1395- <child internal-child="vbox">
1396- <object class="GtkVBox" id="dialog-vbox6">
1397- <property name="visible">True</property>
1398- <property name="spacing">2</property>
1399- <child>
1400- <object class="GtkHBox" id="hbox7">
1401- <property name="visible">True</property>
1402- <child>
1403- <object class="GtkVBox" id="vbox5">
1404- <property name="visible">True</property>
1405- <child>
1406- <object class="GtkImage" id="image4">
1407- <property name="visible">True</property>
1408- <property name="stock">gtk-stop</property>
1409- <property name="icon-size">6</property>
1410- </object>
1411- <packing>
1412- <property name="expand">False</property>
1413- <property name="fill">False</property>
1414- <property name="position">0</property>
1415- </packing>
1416- </child>
1417- </object>
1418- <packing>
1419- <property name="expand">False</property>
1420- <property name="fill">False</property>
1421- <property name="position">0</property>
1422- </packing>
1423- </child>
1424- <child>
1425- <object class="GtkLabel" id="label17">
1426- <property name="visible">True</property>
1427- <property name="label" translatable="yes">&lt;b&gt;Resolution was not changed&lt;/b&gt;
1428-
1429-Quickshot was unable to set your resolution. If you have not already done so, please change it to &lt;b&gt;1024x768&lt;/b&gt;
1430-
1431-To change it, click &lt;b&gt;System -&gt; Preferences -&gt; Monitors&lt;/b&gt; When done, click "Next".</property>
1432- <property name="use_markup">True</property>
1433- <property name="wrap">True</property>
1434- </object>
1435- <packing>
1436- <property name="position">1</property>
1437- </packing>
1438- </child>
1439- </object>
1440- <packing>
1441- <property name="expand">False</property>
1442- <property name="padding">12</property>
1443- <property name="position">1</property>
1444- </packing>
1445- </child>
1446- <child internal-child="action_area">
1447- <object class="GtkHButtonBox" id="dialog-action_area6">
1448- <property name="visible">True</property>
1449- <property name="layout_style">end</property>
1450- <child>
1451- <object class="GtkButton" id="button3">
1452- <property name="label" translatable="yes">Next</property>
1453- <property name="visible">True</property>
1454- <property name="can_focus">True</property>
1455- <property name="has_focus">True</property>
1456- <property name="receives_default">True</property>
1457- <signal name="clicked" handler="show_next"/>
1458- </object>
1459- <packing>
1460- <property name="expand">False</property>
1461- <property name="fill">False</property>
1462- <property name="position">0</property>
1463- </packing>
1464- </child>
1465- </object>
1466- <packing>
1467- <property name="expand">False</property>
1468- <property name="pack_type">end</property>
1469- <property name="position">0</property>
1470- </packing>
1471- </child>
1472- </object>
1473- </child>
1474- <action-widgets>
1475- <action-widget response="0">button3</action-widget>
1476- </action-widgets>
1477- </object>
1478- <object class="GtkDialog" id="Success">
1479- <property name="width_request">550</property>
1480- <property name="height_request">185</property>
1481- <property name="border_width">5</property>
1482- <property name="title" translatable="yes">Quickshot</property>
1483- <property name="resizable">False</property>
1484- <property name="window_position">center-always</property>
1485- <property name="icon">../media/icon.png</property>
1486- <property name="type_hint">normal</property>
1487- <property name="deletable">False</property>
1488- <property name="has_separator">False</property>
1489- <signal name="destroy" handler="on_destroy"/>
1490- <child internal-child="vbox">
1491- <object class="GtkVBox" id="dialog-vbox8">
1492- <property name="visible">True</property>
1493- <property name="spacing">2</property>
1494- <child>
1495- <object class="GtkHBox" id="hbox6">
1496- <property name="visible">True</property>
1497- <child>
1498- <object class="GtkVBox" id="vbox9">
1499- <property name="visible">True</property>
1500- <child>
1501- <object class="GtkImage" id="image5">
1502- <property name="visible">True</property>
1503- <property name="stock">gtk-yes</property>
1504- <property name="icon-size">6</property>
1505- </object>
1506- <packing>
1507- <property name="expand">False</property>
1508- <property name="fill">False</property>
1509- <property name="position">0</property>
1510- </packing>
1511- </child>
1512- </object>
1513- <packing>
1514- <property name="expand">False</property>
1515- <property name="fill">False</property>
1516- <property name="position">0</property>
1517- </packing>
1518- </child>
1519- <child>
1520- <object class="GtkVBox" id="vbox6">
1521- <property name="visible">True</property>
1522- <child>
1523- <object class="GtkLabel" id="label22">
1524- <property name="visible">True</property>
1525- <property name="ypad">1</property>
1526- <property name="label" translatable="yes">&lt;b&gt;Success&lt;/b&gt;
1527-
1528-Your resolution has been changed. Please click "Next" within a few seconds or you will be logged out.
1529- </property>
1530- <property name="use_markup">True</property>
1531- <property name="wrap">True</property>
1532- </object>
1533- <packing>
1534- <property name="position">0</property>
1535- </packing>
1536- </child>
1537- <child>
1538- <object class="GtkLabel" id="label19">
1539- <property name="visible">True</property>
1540- <property name="ypad">1</property>
1541- <property name="use_markup">True</property>
1542- <property name="wrap">True</property>
1543- </object>
1544- <packing>
1545- <property name="position">1</property>
1546- </packing>
1547- </child>
1548- </object>
1549- <packing>
1550- <property name="position">1</property>
1551- </packing>
1552- </child>
1553- </object>
1554- <packing>
1555- <property name="expand">False</property>
1556- <property name="padding">12</property>
1557- <property name="position">1</property>
1558- </packing>
1559- </child>
1560- <child internal-child="action_area">
1561- <object class="GtkHButtonBox" id="dialog-action_area8">
1562- <property name="visible">True</property>
1563- <property name="layout_style">end</property>
1564- <child>
1565- <object class="GtkButton" id="button4">
1566- <property name="label" translatable="yes">Next</property>
1567- <property name="visible">True</property>
1568- <property name="can_focus">True</property>
1569- <property name="has_focus">True</property>
1570- <property name="receives_default">True</property>
1571- <signal name="clicked" handler="success_next"/>
1572- </object>
1573- <packing>
1574- <property name="expand">False</property>
1575- <property name="fill">False</property>
1576- <property name="position">0</property>
1577- </packing>
1578- </child>
1579- </object>
1580- <packing>
1581- <property name="expand">False</property>
1582- <property name="pack_type">end</property>
1583- <property name="position">0</property>
1584- </packing>
1585- </child>
1586- </object>
1587- </child>
1588- <action-widgets>
1589- <action-widget response="0">button4</action-widget>
1590- </action-widgets>
1591- </object>
1592- <object class="GtkDialog" id="shotcheck">
1593- <property name="border_width">5</property>
1594- <property name="title" translatable="yes">Quickshot</property>
1595- <property name="window_position">center-always</property>
1596+ </object>
1597+ <packing>
1598+ <property name="position">1</property>
1599+ </packing>
1600+ </child>
1601+ </object>
1602+ </child>
1603+ </object>
1604+ <object class="QuickshotWindow" id="make_user_account">
1605+ <property name="width_request">580</property>
1606+ <property name="height_request">400</property>
1607+ <property name="title" translatable="yes">Quickshot</property>
1608+ <property name="role">main</property>
1609+ <property name="resizable">False</property>
1610+ <property name="window_position">center</property>
1611+ <property name="icon">../media/icon.png</property>
1612+ <child>
1613+ <object class="GtkVBox" id="vbox2">
1614+ <property name="visible">True</property>
1615+ <child>
1616+ <object class="GtkMenuBar" id="welcome_menubar4">
1617+ <property name="visible">True</property>
1618+ <child>
1619+ <object class="GtkMenuItem" id="menuitem7">
1620+ <property name="visible">True</property>
1621+ <property name="label" translatable="yes">_File</property>
1622+ <property name="use_underline">True</property>
1623+ <child type="submenu">
1624+ <object class="GtkMenu" id="menu7">
1625+ <property name="visible">True</property>
1626+ <child>
1627+ <object class="GtkImageMenuItem" id="imagemenuitem6">
1628+ <property name="label">gtk-quit</property>
1629+ <property name="visible">True</property>
1630+ <property name="use_underline">True</property>
1631+ <property name="use_stock">True</property>
1632+ <accelerator key="q" signal="activate" modifiers="GDK_CONTROL_MASK"/>
1633+ </object>
1634+ </child>
1635+ </object>
1636+ </child>
1637+ </object>
1638+ </child>
1639+ <child>
1640+ <object class="GtkMenuItem" id="menuitem8">
1641+ <property name="visible">True</property>
1642+ <property name="label" translatable="yes">_Help</property>
1643+ <property name="use_underline">True</property>
1644+ <child type="submenu">
1645+ <object class="GtkMenu" id="menu8">
1646+ <property name="visible">True</property>
1647+ <child>
1648+ <object class="GtkImageMenuItem" id="imagemenuitem7">
1649+ <property name="label">gtk-about</property>
1650+ <property name="visible">True</property>
1651+ <property name="use_underline">True</property>
1652+ <property name="use_stock">True</property>
1653+ </object>
1654+ </child>
1655+ </object>
1656+ </child>
1657+ </object>
1658+ </child>
1659+ </object>
1660+ <packing>
1661+ <property name="expand">False</property>
1662+ <property name="position">0</property>
1663+ </packing>
1664+ </child>
1665+ <child>
1666+ <object class="GtkVBox" id="vbox7">
1667+ <property name="visible">True</property>
1668+ <property name="border_width">12</property>
1669+ <property name="spacing">12</property>
1670+ <child>
1671+ <object class="GtkHBox" id="hbox3">
1672+ <property name="visible">True</property>
1673+ <property name="spacing">12</property>
1674+ <child>
1675+ <object class="GtkVBox" id="vbox13">
1676+ <property name="visible">True</property>
1677+ <child>
1678+ <object class="GtkLabel" id="label4">
1679+ <property name="visible">True</property>
1680+ <property name="xalign">0</property>
1681+ <property name="label" translatable="yes">Please enter a password for the $user account. Please do not use the same password as your normal user. Once you have entered two matching passwords please click "Forward" to set up the account.</property>
1682+ <property name="wrap">True</property>
1683+ <property name="width_chars">50</property>
1684+ </object>
1685+ <packing>
1686+ <property name="padding">6</property>
1687+ <property name="position">0</property>
1688+ </packing>
1689+ </child>
1690+ <child>
1691+ <object class="GtkHBox" id="hbox4">
1692+ <property name="visible">True</property>
1693+ <property name="spacing">12</property>
1694+ <child>
1695+ <object class="GtkVBox" id="vbox15">
1696+ <property name="visible">True</property>
1697+ <property name="spacing">12</property>
1698+ <property name="homogeneous">True</property>
1699+ <child>
1700+ <object class="GtkLabel" id="label10">
1701+ <property name="visible">True</property>
1702+ <property name="xalign">0</property>
1703+ <property name="label" translatable="yes">Password:</property>
1704+ </object>
1705+ <packing>
1706+ <property name="position">0</property>
1707+ </packing>
1708+ </child>
1709+ <child>
1710+ <object class="GtkLabel" id="label11">
1711+ <property name="visible">True</property>
1712+ <property name="xalign">0</property>
1713+ <property name="label" translatable="yes">Confirm Password:</property>
1714+ </object>
1715+ <packing>
1716+ <property name="position">1</property>
1717+ </packing>
1718+ </child>
1719+ </object>
1720+ <packing>
1721+ <property name="expand">False</property>
1722+ <property name="position">0</property>
1723+ </packing>
1724+ </child>
1725+ <child>
1726+ <object class="GtkVBox" id="vbox17">
1727+ <property name="width_request">60</property>
1728+ <property name="visible">True</property>
1729+ <property name="spacing">12</property>
1730+ <property name="homogeneous">True</property>
1731+ <child>
1732+ <object class="GtkEntry" id="entry4">
1733+ <property name="visible">True</property>
1734+ <property name="can_focus">True</property>
1735+ <property name="invisible_char">&#x25CF;</property>
1736+ <property name="width_chars">50</property>
1737+ </object>
1738+ <packing>
1739+ <property name="expand">False</property>
1740+ <property name="position">0</property>
1741+ </packing>
1742+ </child>
1743+ <child>
1744+ <object class="GtkEntry" id="entry5">
1745+ <property name="visible">True</property>
1746+ <property name="can_focus">True</property>
1747+ <property name="invisible_char">&#x25CF;</property>
1748+ <property name="width_chars">50</property>
1749+ </object>
1750+ <packing>
1751+ <property name="expand">False</property>
1752+ <property name="position">1</property>
1753+ </packing>
1754+ </child>
1755+ </object>
1756+ <packing>
1757+ <property name="position">1</property>
1758+ </packing>
1759+ </child>
1760+ </object>
1761+ <packing>
1762+ <property name="padding">12</property>
1763+ <property name="position">1</property>
1764+ </packing>
1765+ </child>
1766+ </object>
1767+ <packing>
1768+ <property name="position">0</property>
1769+ </packing>
1770+ </child>
1771+ <child>
1772+ <object class="GtkImage" id="image2">
1773+ <property name="visible">True</property>
1774+ <property name="yalign">0</property>
1775+ <property name="pixbuf">logo.png</property>
1776+ </object>
1777+ <packing>
1778+ <property name="position">1</property>
1779+ </packing>
1780+ </child>
1781+ </object>
1782+ <packing>
1783+ <property name="position">0</property>
1784+ </packing>
1785+ </child>
1786+ <child>
1787+ <object class="GtkAlignment" id="alignment1">
1788+ <property name="visible">True</property>
1789+ <child>
1790+ <placeholder/>
1791+ </child>
1792+ </object>
1793+ <packing>
1794+ <property name="padding">25</property>
1795+ <property name="position">1</property>
1796+ </packing>
1797+ </child>
1798+ <child>
1799+ <object class="GtkHButtonBox" id="hbuttonbox4">
1800+ <property name="visible">True</property>
1801+ <property name="spacing">12</property>
1802+ <property name="layout_style">end</property>
1803+ <child>
1804+ <object class="GtkButton" id="button2">
1805+ <property name="label" translatable="yes">Close</property>
1806+ <property name="visible">True</property>
1807+ <property name="can_focus">True</property>
1808+ <property name="receives_default">True</property>
1809+ </object>
1810+ <packing>
1811+ <property name="expand">False</property>
1812+ <property name="fill">False</property>
1813+ <property name="position">0</property>
1814+ <property name="secondary">True</property>
1815+ </packing>
1816+ </child>
1817+ <child>
1818+ <object class="GtkButton" id="button5">
1819+ <property name="label" translatable="yes">Previous</property>
1820+ <property name="visible">True</property>
1821+ <property name="can_focus">True</property>
1822+ <property name="receives_default">True</property>
1823+ </object>
1824+ <packing>
1825+ <property name="expand">False</property>
1826+ <property name="fill">False</property>
1827+ <property name="position">1</property>
1828+ </packing>
1829+ </child>
1830+ <child>
1831+ <object class="GtkButton" id="button9">
1832+ <property name="label" translatable="yes">Next</property>
1833+ <property name="visible">True</property>
1834+ <property name="can_focus">True</property>
1835+ <property name="receives_default">True</property>
1836+ </object>
1837+ <packing>
1838+ <property name="expand">False</property>
1839+ <property name="fill">False</property>
1840+ <property name="pack_type">end</property>
1841+ <property name="position">2</property>
1842+ </packing>
1843+ </child>
1844+ </object>
1845+ <packing>
1846+ <property name="expand">False</property>
1847+ <property name="position">2</property>
1848+ </packing>
1849+ </child>
1850+ </object>
1851+ <packing>
1852+ <property name="position">1</property>
1853+ </packing>
1854+ </child>
1855+ </object>
1856+ </child>
1857+ </object>
1858+ <object class="GtkWindow" id="screenshot_detail">
1859+ <property name="width_request">580</property>
1860+ <property name="height_request">400</property>
1861+ <child>
1862+ <object class="GtkVBox" id="vbox8">
1863+ <property name="visible">True</property>
1864+ <child>
1865+ <object class="GtkMenuBar" id="welcome_menubar5">
1866+ <property name="visible">True</property>
1867+ <child>
1868+ <object class="GtkMenuItem" id="menuitem9">
1869+ <property name="visible">True</property>
1870+ <property name="label" translatable="yes">_File</property>
1871+ <property name="use_underline">True</property>
1872+ <child type="submenu">
1873+ <object class="GtkMenu" id="menu9">
1874+ <property name="visible">True</property>
1875+ <child>
1876+ <object class="GtkImageMenuItem" id="imagemenuitem8">
1877+ <property name="label">gtk-quit</property>
1878+ <property name="visible">True</property>
1879+ <property name="use_underline">True</property>
1880+ <property name="use_stock">True</property>
1881+ <accelerator key="q" signal="activate" modifiers="GDK_CONTROL_MASK"/>
1882+ </object>
1883+ </child>
1884+ </object>
1885+ </child>
1886+ </object>
1887+ </child>
1888+ <child>
1889+ <object class="GtkMenuItem" id="menuitem10">
1890+ <property name="visible">True</property>
1891+ <property name="label" translatable="yes">_Help</property>
1892+ <property name="use_underline">True</property>
1893+ <child type="submenu">
1894+ <object class="GtkMenu" id="menu10">
1895+ <property name="visible">True</property>
1896+ <child>
1897+ <object class="GtkImageMenuItem" id="imagemenuitem9">
1898+ <property name="label">gtk-about</property>
1899+ <property name="visible">True</property>
1900+ <property name="use_underline">True</property>
1901+ <property name="use_stock">True</property>
1902+ </object>
1903+ </child>
1904+ </object>
1905+ </child>
1906+ </object>
1907+ </child>
1908+ </object>
1909+ <packing>
1910+ <property name="expand">False</property>
1911+ <property name="position">0</property>
1912+ </packing>
1913+ </child>
1914+ <child>
1915+ <object class="GtkVBox" id="vbox9">
1916+ <property name="visible">True</property>
1917+ <property name="border_width">12</property>
1918+ <property name="spacing">12</property>
1919+ <child>
1920+ <object class="GtkHBox" id="hbox5">
1921+ <property name="visible">True</property>
1922+ <property name="spacing">12</property>
1923+ <property name="homogeneous">True</property>
1924+ <child>
1925+ <object class="GtkVBox" id="vbox16">
1926+ <property name="visible">True</property>
1927+ <property name="spacing">12</property>
1928+ <child>
1929+ <object class="GtkLabel" id="label8">
1930+ <property name="visible">True</property>
1931+ <property name="xalign">0</property>
1932+ <property name="label" translatable="yes">Screenshot Description:</property>
1933+ <property name="wrap">True</property>
1934+ <property name="width_chars">30</property>
1935+ </object>
1936+ <packing>
1937+ <property name="expand">False</property>
1938+ <property name="position">0</property>
1939+ </packing>
1940+ </child>
1941+ <child>
1942+ <object class="GtkLabel" id="label15">
1943+ <property name="visible">True</property>
1944+ <property name="xalign">0</property>
1945+ <property name="label" translatable="yes">Insert Text Here</property>
1946+ <property name="wrap">True</property>
1947+ <property name="width_chars">40</property>
1948+ </object>
1949+ <packing>
1950+ <property name="position">1</property>
1951+ </packing>
1952+ </child>
1953+ <child>
1954+ <object class="GtkLabel" id="label13">
1955+ <property name="visible">True</property>
1956+ <property name="xalign">0</property>
1957+ <property name="label" translatable="yes">Screenshot Steps:</property>
1958+ <property name="wrap">True</property>
1959+ <property name="width_chars">30</property>
1960+ </object>
1961+ <packing>
1962+ <property name="expand">False</property>
1963+ <property name="position">2</property>
1964+ </packing>
1965+ </child>
1966+ <child>
1967+ <object class="GtkLabel" id="label21">
1968+ <property name="visible">True</property>
1969+ <property name="xalign">0</property>
1970+ <property name="label" translatable="yes">Screenshot Description:</property>
1971+ <property name="wrap">True</property>
1972+ <property name="width_chars">30</property>
1973+ </object>
1974+ <packing>
1975+ <property name="position">3</property>
1976+ </packing>
1977+ </child>
1978+ <child>
1979+ <object class="GtkLabel" id="label14">
1980+ <property name="visible">True</property>
1981+ <property name="xalign">0</property>
1982+ <property name="label" translatable="yes">Common Attributes:</property>
1983+ <property name="wrap">True</property>
1984+ <property name="width_chars">30</property>
1985+ </object>
1986+ <packing>
1987+ <property name="expand">False</property>
1988+ <property name="position">4</property>
1989+ </packing>
1990+ </child>
1991+ <child>
1992+ <object class="GtkLabel" id="label22">
1993+ <property name="visible">True</property>
1994+ <property name="xalign">0</property>
1995+ <property name="label" translatable="yes">Screenshot Description:</property>
1996+ <property name="wrap">True</property>
1997+ <property name="width_chars">30</property>
1998+ </object>
1999+ <packing>
2000+ <property name="position">5</property>
2001+ </packing>
2002+ </child>
2003+ </object>
2004+ <packing>
2005+ <property name="expand">False</property>
2006+ <property name="position">0</property>
2007+ </packing>
2008+ </child>
2009+ <child>
2010+ <object class="GtkVBox" id="vbox21">
2011+ <property name="visible">True</property>
2012+ <property name="spacing">12</property>
2013+ <child>
2014+ <object class="GtkImage" id="image3">
2015+ <property name="visible">True</property>
2016+ <property name="stock">gtk-missing-image</property>
2017+ </object>
2018+ <packing>
2019+ <property name="position">0</property>
2020+ </packing>
2021+ </child>
2022+ <child>
2023+ <object class="GtkLabel" id="label23">
2024+ <property name="visible">True</property>
2025+ <property name="xalign">0</property>
2026+ <property name="label" translatable="yes">Click the image to see a larger version</property>
2027+ <property name="wrap">True</property>
2028+ <property name="width_chars">40</property>
2029+ </object>
2030+ <packing>
2031+ <property name="expand">False</property>
2032+ <property name="position">1</property>
2033+ </packing>
2034+ </child>
2035+ </object>
2036+ <packing>
2037+ <property name="position">1</property>
2038+ </packing>
2039+ </child>
2040+ </object>
2041+ <packing>
2042+ <property name="position">0</property>
2043+ </packing>
2044+ </child>
2045+ <child>
2046+ <object class="GtkHButtonBox" id="hbuttonbox5">
2047+ <property name="visible">True</property>
2048+ <property name="spacing">12</property>
2049+ <property name="layout_style">end</property>
2050+ <child>
2051+ <object class="GtkButton" id="button6">
2052+ <property name="label" translatable="yes">Close</property>
2053+ <property name="visible">True</property>
2054+ <property name="can_focus">True</property>
2055+ <property name="receives_default">True</property>
2056+ </object>
2057+ <packing>
2058+ <property name="expand">False</property>
2059+ <property name="fill">False</property>
2060+ <property name="position">0</property>
2061+ <property name="secondary">True</property>
2062+ </packing>
2063+ </child>
2064+ <child>
2065+ <object class="GtkButton" id="button7">
2066+ <property name="label" translatable="yes">Previous</property>
2067+ <property name="visible">True</property>
2068+ <property name="can_focus">True</property>
2069+ <property name="receives_default">True</property>
2070+ </object>
2071+ <packing>
2072+ <property name="expand">False</property>
2073+ <property name="fill">False</property>
2074+ <property name="position">1</property>
2075+ </packing>
2076+ </child>
2077+ <child>
2078+ <object class="GtkButton" id="button8">
2079+ <property name="label" translatable="yes">Next</property>
2080+ <property name="visible">True</property>
2081+ <property name="can_focus">True</property>
2082+ <property name="receives_default">True</property>
2083+ </object>
2084+ <packing>
2085+ <property name="expand">False</property>
2086+ <property name="fill">False</property>
2087+ <property name="pack_type">end</property>
2088+ <property name="position">2</property>
2089+ </packing>
2090+ </child>
2091+ </object>
2092+ <packing>
2093+ <property name="expand">False</property>
2094+ <property name="position">1</property>
2095+ </packing>
2096+ </child>
2097+ </object>
2098+ <packing>
2099+ <property name="position">1</property>
2100+ </packing>
2101+ </child>
2102+ </object>
2103+ </child>
2104+ </object>
2105+ <object class="GtkWindow" id="window1">
2106 <property name="default_width">1024</property>
2107 <property name="default_height">700</property>
2108- <property name="icon">../media/icon.png</property>
2109- <property name="type_hint">normal</property>
2110- <property name="deletable">False</property>
2111- <property name="has_separator">False</property>
2112- <signal name="destroy" handler="on_destroy"/>
2113- <child internal-child="vbox">
2114- <object class="GtkVBox" id="dialog-vbox9">
2115+ <child>
2116+ <object class="GtkVBox" id="vbox10">
2117 <property name="visible">True</property>
2118- <property name="spacing">2</property>
2119 <child>
2120- <object class="GtkLabel" id="label23">
2121+ <object class="GtkMenuBar" id="welcome_menubar6">
2122 <property name="visible">True</property>
2123- <property name="label" translatable="yes">
2124- Please compare the screenshot that you have taken with the reference sample. If satisfied, click the "Upload" button; otherwise, click "Recapture"
2125- </property>
2126- <property name="use_markup">True</property>
2127- <property name="ellipsize">start</property>
2128+ <child>
2129+ <object class="GtkMenuItem" id="menuitem11">
2130+ <property name="visible">True</property>
2131+ <property name="label" translatable="yes">_File</property>
2132+ <property name="use_underline">True</property>
2133+ <child type="submenu">
2134+ <object class="GtkMenu" id="menu11">
2135+ <property name="visible">True</property>
2136+ <child>
2137+ <object class="GtkImageMenuItem" id="imagemenuitem11">
2138+ <property name="label">gtk-quit</property>
2139+ <property name="visible">True</property>
2140+ <property name="use_underline">True</property>
2141+ <property name="use_stock">True</property>
2142+ <accelerator key="q" signal="activate" modifiers="GDK_CONTROL_MASK"/>
2143+ </object>
2144+ </child>
2145+ </object>
2146+ </child>
2147+ </object>
2148+ </child>
2149+ <child>
2150+ <object class="GtkMenuItem" id="menuitem12">
2151+ <property name="visible">True</property>
2152+ <property name="label" translatable="yes">_Help</property>
2153+ <property name="use_underline">True</property>
2154+ <child type="submenu">
2155+ <object class="GtkMenu" id="menu12">
2156+ <property name="visible">True</property>
2157+ <child>
2158+ <object class="GtkImageMenuItem" id="imagemenuitem12">
2159+ <property name="label">gtk-about</property>
2160+ <property name="visible">True</property>
2161+ <property name="use_underline">True</property>
2162+ <property name="use_stock">True</property>
2163+ </object>
2164+ </child>
2165+ </object>
2166+ </child>
2167+ </object>
2168+ </child>
2169 </object>
2170 <packing>
2171 <property name="expand">False</property>
2172+ <property name="position">0</property>
2173+ </packing>
2174+ </child>
2175+ <child>
2176+ <object class="GtkVBox" id="vbox18">
2177+ <property name="visible">True</property>
2178+ <property name="border_width">12</property>
2179+ <property name="spacing">12</property>
2180+ <child>
2181+ <object class="GtkLabel" id="label16">
2182+ <property name="visible">True</property>
2183+ <property name="xalign">0</property>
2184+ <property name="label" translatable="yes">Please compare your screenshot with the sample one before you upload it.</property>
2185+ <property name="single_line_mode">True</property>
2186+ </object>
2187+ <packing>
2188+ <property name="expand">False</property>
2189+ <property name="position">0</property>
2190+ </packing>
2191+ </child>
2192+ <child>
2193+ <object class="GtkHBox" id="hbox1">
2194+ <property name="visible">True</property>
2195+ <property name="spacing">12</property>
2196+ <property name="homogeneous">True</property>
2197+ <child>
2198+ <object class="GtkVBox" id="vbox19">
2199+ <property name="visible">True</property>
2200+ <property name="spacing">12</property>
2201+ <child>
2202+ <object class="GtkScrolledWindow" id="scrolledwindow2">
2203+ <property name="visible">True</property>
2204+ <property name="can_focus">True</property>
2205+ <property name="hscrollbar_policy">automatic</property>
2206+ <property name="vscrollbar_policy">automatic</property>
2207+ <child>
2208+ <object class="GtkViewport" id="viewport2">
2209+ <property name="visible">True</property>
2210+ <property name="resize_mode">queue</property>
2211+ <child>
2212+ <object class="GtkImage" id="image7">
2213+ <property name="visible">True</property>
2214+ <property name="stock">gtk-missing-image</property>
2215+ </object>
2216+ </child>
2217+ </object>
2218+ </child>
2219+ </object>
2220+ <packing>
2221+ <property name="position">0</property>
2222+ </packing>
2223+ </child>
2224+ <child>
2225+ <object class="GtkLabel" id="label17">
2226+ <property name="visible">True</property>
2227+ <property name="label" translatable="yes">Sample</property>
2228+ </object>
2229+ <packing>
2230+ <property name="expand">False</property>
2231+ <property name="position">1</property>
2232+ </packing>
2233+ </child>
2234+ </object>
2235+ <packing>
2236+ <property name="position">0</property>
2237+ </packing>
2238+ </child>
2239+ <child>
2240+ <object class="GtkVBox" id="vbox20">
2241+ <property name="visible">True</property>
2242+ <property name="spacing">12</property>
2243+ <child>
2244+ <object class="GtkScrolledWindow" id="scrolledwindow3">
2245+ <property name="visible">True</property>
2246+ <property name="can_focus">True</property>
2247+ <property name="hscrollbar_policy">automatic</property>
2248+ <property name="vscrollbar_policy">automatic</property>
2249+ <child>
2250+ <object class="GtkViewport" id="viewport1">
2251+ <property name="visible">True</property>
2252+ <property name="resize_mode">queue</property>
2253+ <child>
2254+ <object class="GtkImage" id="image8">
2255+ <property name="visible">True</property>
2256+ <property name="stock">gtk-missing-image</property>
2257+ </object>
2258+ </child>
2259+ </object>
2260+ </child>
2261+ </object>
2262+ <packing>
2263+ <property name="position">0</property>
2264+ </packing>
2265+ </child>
2266+ <child>
2267+ <object class="GtkLabel" id="label18">
2268+ <property name="visible">True</property>
2269+ <property name="label" translatable="yes">Captured Screenshot </property>
2270+ </object>
2271+ <packing>
2272+ <property name="expand">False</property>
2273+ <property name="position">1</property>
2274+ </packing>
2275+ </child>
2276+ </object>
2277+ <packing>
2278+ <property name="position">1</property>
2279+ </packing>
2280+ </child>
2281+ </object>
2282+ <packing>
2283+ <property name="position">1</property>
2284+ </packing>
2285+ </child>
2286+ <child>
2287+ <object class="GtkHButtonBox" id="hbuttonbox8">
2288+ <property name="visible">True</property>
2289+ <property name="spacing">12</property>
2290+ <property name="layout_style">end</property>
2291+ <child>
2292+ <object class="GtkButton" id="button25">
2293+ <property name="label" translatable="yes">Close</property>
2294+ <property name="visible">True</property>
2295+ <property name="can_focus">True</property>
2296+ <property name="receives_default">True</property>
2297+ </object>
2298+ <packing>
2299+ <property name="expand">False</property>
2300+ <property name="fill">False</property>
2301+ <property name="position">0</property>
2302+ <property name="secondary">True</property>
2303+ </packing>
2304+ </child>
2305+ <child>
2306+ <object class="GtkButton" id="button26">
2307+ <property name="label" translatable="yes">Previous</property>
2308+ <property name="visible">True</property>
2309+ <property name="can_focus">True</property>
2310+ <property name="receives_default">True</property>
2311+ </object>
2312+ <packing>
2313+ <property name="expand">False</property>
2314+ <property name="fill">False</property>
2315+ <property name="position">1</property>
2316+ </packing>
2317+ </child>
2318+ <child>
2319+ <object class="GtkButton" id="button27">
2320+ <property name="label" translatable="yes">Next</property>
2321+ <property name="visible">True</property>
2322+ <property name="can_focus">True</property>
2323+ <property name="receives_default">True</property>
2324+ </object>
2325+ <packing>
2326+ <property name="expand">False</property>
2327+ <property name="fill">False</property>
2328+ <property name="pack_type">end</property>
2329+ <property name="position">2</property>
2330+ </packing>
2331+ </child>
2332+ </object>
2333+ <packing>
2334+ <property name="expand">False</property>
2335+ <property name="position">2</property>
2336+ </packing>
2337+ </child>
2338+ </object>
2339+ <packing>
2340 <property name="position">1</property>
2341 </packing>
2342 </child>
2343- <child>
2344- <object class="GtkNotebook" id="notebook1">
2345- <property name="visible">True</property>
2346- <property name="can_focus">True</property>
2347- <property name="homogeneous">True</property>
2348- <child>
2349- <object class="GtkScrolledWindow" id="scrolledwindow1">
2350- <property name="visible">True</property>
2351- <property name="can_focus">True</property>
2352- <property name="hscrollbar_policy">automatic</property>
2353- <property name="vscrollbar_policy">automatic</property>
2354- <child>
2355- <object class="GtkViewport" id="viewport1">
2356- <property name="visible">True</property>
2357- <property name="resize_mode">queue</property>
2358- <child>
2359- <object class="GtkImage" id="newscreenshotimage">
2360- <property name="visible">True</property>
2361- <property name="stock">gtk-missing-image</property>
2362- </object>
2363- </child>
2364- </object>
2365- </child>
2366- </object>
2367- </child>
2368- <child type="tab">
2369- <object class="GtkLabel" id="label20">
2370- <property name="visible">True</property>
2371- <property name="label" translatable="yes">Your Screenshot</property>
2372- </object>
2373- <packing>
2374- <property name="tab_fill">False</property>
2375- </packing>
2376- </child>
2377- <child>
2378- <object class="GtkScrolledWindow" id="scrolledwindow2">
2379- <property name="visible">True</property>
2380- <property name="can_focus">True</property>
2381- <property name="hscrollbar_policy">automatic</property>
2382- <property name="vscrollbar_policy">automatic</property>
2383- <child>
2384- <object class="GtkViewport" id="viewport2">
2385- <property name="visible">True</property>
2386- <property name="resize_mode">queue</property>
2387- <child>
2388- <object class="GtkImage" id="samplescreenshotimage">
2389- <property name="visible">True</property>
2390- <property name="stock">gtk-missing-image</property>
2391- </object>
2392- </child>
2393- </object>
2394- </child>
2395- </object>
2396- <packing>
2397- <property name="position">1</property>
2398- </packing>
2399- </child>
2400- <child type="tab">
2401- <object class="GtkLabel" id="label21">
2402- <property name="visible">True</property>
2403- <property name="can_focus">True</property>
2404- <property name="has_focus">True</property>
2405- <property name="label" translatable="yes">Sample Screenshot</property>
2406- </object>
2407- <packing>
2408- <property name="position">1</property>
2409- <property name="tab_fill">False</property>
2410- </packing>
2411- </child>
2412- </object>
2413- <packing>
2414- <property name="position">2</property>
2415- </packing>
2416- </child>
2417- <child internal-child="action_area">
2418- <object class="GtkHButtonBox" id="dialog-action_area9">
2419- <property name="visible">True</property>
2420- <property name="layout_style">end</property>
2421- <child>
2422- <object class="GtkButton" id="button7">
2423- <property name="label" translatable="yes">Recapture</property>
2424- <property name="visible">True</property>
2425- <property name="can_focus">True</property>
2426- <property name="receives_default">True</property>
2427- <signal name="clicked" handler="on_screenshotinfo_next_button_clicked"/>
2428- </object>
2429- <packing>
2430- <property name="expand">False</property>
2431- <property name="fill">False</property>
2432- <property name="position">0</property>
2433- </packing>
2434- </child>
2435- <child>
2436- <object class="GtkButton" id="button6">
2437- <property name="label" translatable="yes">Upload</property>
2438- <property name="visible">True</property>
2439- <property name="can_focus">True</property>
2440- <property name="receives_default">True</property>
2441- <signal name="clicked" handler="on_upload_button_clicked"/>
2442- </object>
2443- <packing>
2444- <property name="expand">False</property>
2445- <property name="fill">False</property>
2446- <property name="position">1</property>
2447- </packing>
2448- </child>
2449- </object>
2450- <packing>
2451- <property name="expand">False</property>
2452- <property name="pack_type">end</property>
2453- <property name="position">0</property>
2454- </packing>
2455- </child>
2456 </object>
2457 </child>
2458- <action-widgets>
2459- <action-widget response="0">button7</action-widget>
2460- <action-widget response="0">button6</action-widget>
2461- </action-widgets>
2462 </object>
2463- <object class="GtkDialog" id="errordialog">
2464+ <object class="GtkDialog" id="dialog1">
2465 <property name="border_width">5</property>
2466- <property name="default_width">450</property>
2467- <property name="default_height">320</property>
2468- <property name="icon">../media/icon.png</property>
2469- <property name="icon_name">Quickshot Error</property>
2470 <property name="type_hint">normal</property>
2471 <property name="has_separator">False</property>
2472- <signal name="destroy" handler="on_destroy"/>
2473 <child internal-child="vbox">
2474- <object class="GtkVBox" id="dialog-vbox10">
2475+ <object class="GtkVBox" id="dialog-vbox1">
2476 <property name="visible">True</property>
2477 <property name="spacing">2</property>
2478 <child>
2479- <object class="GtkScrolledWindow" id="scrolledwindow4">
2480+ <object class="GtkLabel" id="label19">
2481 <property name="visible">True</property>
2482- <property name="can_focus">True</property>
2483- <property name="hscrollbar_policy">automatic</property>
2484- <child>
2485- <object class="GtkViewport" id="viewport3">
2486- <property name="visible">True</property>
2487- <property name="resize_mode">queue</property>
2488- <child>
2489- <object class="GtkLabel" id="label9">
2490- <property name="visible">True</property>
2491- <property name="xalign">0</property>
2492- <property name="yalign">0</property>
2493- <property name="xpad">10</property>
2494- <property name="ypad">10</property>
2495- <property name="label" translatable="yes">Oh, no! An error occurred and it's not something Quickshot can handle by itself.
2496-
2497-</property>
2498- <property name="use_markup">True</property>
2499- <property name="wrap">True</property>
2500- </object>
2501- </child>
2502- </object>
2503- </child>
2504+ <property name="xalign">0</property>
2505+ <property name="yalign">0</property>
2506+ <property name="label" translatable="yes">The account $user has been made please click logout to start taking screenshots. Or click close to take them later.</property>
2507+ <property name="wrap">True</property>
2508 </object>
2509 <packing>
2510 <property name="position">1</property>
2511 </packing>
2512 </child>
2513 <child internal-child="action_area">
2514- <object class="GtkHButtonBox" id="dialog-action_area10">
2515+ <object class="GtkHButtonBox" id="dialog-action_area1">
2516 <property name="visible">True</property>
2517 <property name="layout_style">end</property>
2518 <child>
2519- <object class="GtkButton" id="button8">
2520+ <object class="GtkButton" id="button13">
2521 <property name="label" translatable="yes">Close</property>
2522 <property name="visible">True</property>
2523 <property name="can_focus">True</property>
2524 <property name="receives_default">True</property>
2525- <signal name="clicked" handler="quit"/>
2526 </object>
2527 <packing>
2528 <property name="expand">False</property>
2529@@ -1240,12 +1403,11 @@
2530 </packing>
2531 </child>
2532 <child>
2533- <object class="GtkButton" id="button9">
2534- <property name="label" translatable="yes">File a bug</property>
2535+ <object class="GtkButton" id="button14">
2536+ <property name="label" translatable="yes">Logout</property>
2537 <property name="visible">True</property>
2538 <property name="can_focus">True</property>
2539 <property name="receives_default">True</property>
2540- <signal name="clicked" handler="file_a_bug"/>
2541 </object>
2542 <packing>
2543 <property name="expand">False</property>
2544@@ -1263,8 +1425,183 @@
2545 </object>
2546 </child>
2547 <action-widgets>
2548- <action-widget response="0">button8</action-widget>
2549- <action-widget response="0">button9</action-widget>
2550+ <action-widget response="0">button13</action-widget>
2551+ <action-widget response="0">button14</action-widget>
2552 </action-widgets>
2553 </object>
2554+ <object class="GtkWindow" id="choose_project">
2555+ <property name="title" translatable="yes">Quickshot - Choose Project</property>
2556+ <property name="resizable">False</property>
2557+ <child>
2558+ <object class="GtkVBox" id="vbox22">
2559+ <property name="visible">True</property>
2560+ <child>
2561+ <object class="GtkMenuBar" id="welcome_menubar1">
2562+ <property name="visible">True</property>
2563+ <child>
2564+ <object class="GtkMenuItem" id="menuitem4">
2565+ <property name="visible">True</property>
2566+ <property name="label" translatable="yes">_File</property>
2567+ <property name="use_underline">True</property>
2568+ <child type="submenu">
2569+ <object class="GtkMenu" id="menu3">
2570+ <property name="visible">True</property>
2571+ <child>
2572+ <object class="GtkImageMenuItem" id="imagemenuitem5">
2573+ <property name="label">gtk-quit</property>
2574+ <property name="visible">True</property>
2575+ <property name="use_underline">True</property>
2576+ <property name="use_stock">True</property>
2577+ <accelerator key="q" signal="activate" modifiers="GDK_CONTROL_MASK"/>
2578+ </object>
2579+ </child>
2580+ </object>
2581+ </child>
2582+ </object>
2583+ </child>
2584+ <child>
2585+ <object class="GtkMenuItem" id="menuitem15">
2586+ <property name="visible">True</property>
2587+ <property name="label" translatable="yes">_Help</property>
2588+ <property name="use_underline">True</property>
2589+ <child type="submenu">
2590+ <object class="GtkMenu" id="menu16">
2591+ <property name="visible">True</property>
2592+ <child>
2593+ <object class="GtkImageMenuItem" id="imagemenuitem10">
2594+ <property name="label">gtk-about</property>
2595+ <property name="visible">True</property>
2596+ <property name="use_underline">True</property>
2597+ <property name="use_stock">True</property>
2598+ </object>
2599+ </child>
2600+ </object>
2601+ </child>
2602+ </object>
2603+ </child>
2604+ </object>
2605+ <packing>
2606+ <property name="expand">False</property>
2607+ <property name="position">0</property>
2608+ </packing>
2609+ </child>
2610+ <child>
2611+ <object class="GtkVBox" id="vbox23">
2612+ <property name="visible">True</property>
2613+ <property name="border_width">12</property>
2614+ <property name="spacing">12</property>
2615+ <child>
2616+ <object class="GtkLabel" id="label2">
2617+ <property name="visible">True</property>
2618+ <property name="xalign">0</property>
2619+ <property name="label" translatable="yes">Take screenshots for:</property>
2620+ </object>
2621+ <packing>
2622+ <property name="expand">False</property>
2623+ <property name="position">0</property>
2624+ </packing>
2625+ </child>
2626+ <child>
2627+ <object class="GtkScrolledWindow" id="scrolledwindow6">
2628+ <property name="visible">True</property>
2629+ <property name="can_focus">True</property>
2630+ <property name="hscrollbar_policy">automatic</property>
2631+ <property name="vscrollbar_policy">automatic</property>
2632+ <child>
2633+ <object class="GtkTreeView" id="screenshottreeview2">
2634+ <property name="visible">True</property>
2635+ <property name="can_focus">True</property>
2636+ <property name="model">project_list</property>
2637+ <property name="headers_clickable">False</property>
2638+ <property name="search_column">0</property>
2639+ <child>
2640+ <object class="GtkTreeViewColumn" id="name2">
2641+ <property name="title">Project</property>
2642+ <child>
2643+ <object class="GtkCellRendererText" id="cellrenderertext1"/>
2644+ <attributes>
2645+ <attribute name="text">0</attribute>
2646+ </attributes>
2647+ </child>
2648+ </object>
2649+ </child>
2650+ <child>
2651+ <object class="GtkTreeViewColumn" id="status2">
2652+ <property name="title">Description</property>
2653+ <child>
2654+ <object class="GtkCellRendererText" id="cellrenderertext2"/>
2655+ <attributes>
2656+ <attribute name="text">1</attribute>
2657+ </attributes>
2658+ </child>
2659+ </object>
2660+ </child>
2661+ </object>
2662+ </child>
2663+ </object>
2664+ <packing>
2665+ <property name="padding">12</property>
2666+ <property name="position">1</property>
2667+ </packing>
2668+ </child>
2669+ <child>
2670+ <object class="GtkHButtonBox" id="hbuttonbox6">
2671+ <property name="visible">True</property>
2672+ <property name="spacing">12</property>
2673+ <property name="layout_style">end</property>
2674+ <child>
2675+ <object class="GtkButton" id="button11">
2676+ <property name="label" translatable="yes">Close</property>
2677+ <property name="visible">True</property>
2678+ <property name="can_focus">True</property>
2679+ <property name="receives_default">True</property>
2680+ </object>
2681+ <packing>
2682+ <property name="expand">False</property>
2683+ <property name="fill">False</property>
2684+ <property name="position">0</property>
2685+ <property name="secondary">True</property>
2686+ </packing>
2687+ </child>
2688+ <child>
2689+ <object class="GtkButton" id="button12">
2690+ <property name="label" translatable="yes">Previous</property>
2691+ <property name="visible">True</property>
2692+ <property name="can_focus">True</property>
2693+ <property name="receives_default">True</property>
2694+ </object>
2695+ <packing>
2696+ <property name="expand">False</property>
2697+ <property name="fill">False</property>
2698+ <property name="position">1</property>
2699+ </packing>
2700+ </child>
2701+ <child>
2702+ <object class="GtkButton" id="button21">
2703+ <property name="label" translatable="yes">Next</property>
2704+ <property name="visible">True</property>
2705+ <property name="can_focus">True</property>
2706+ <property name="receives_default">True</property>
2707+ </object>
2708+ <packing>
2709+ <property name="expand">False</property>
2710+ <property name="fill">False</property>
2711+ <property name="pack_type">end</property>
2712+ <property name="position">2</property>
2713+ </packing>
2714+ </child>
2715+ </object>
2716+ <packing>
2717+ <property name="expand">False</property>
2718+ <property name="position">2</property>
2719+ </packing>
2720+ </child>
2721+ </object>
2722+ <packing>
2723+ <property name="position">1</property>
2724+ </packing>
2725+ </child>
2726+ </object>
2727+ </child>
2728+ </object>
2729 </interface>

Subscribers

People subscribed via source and target branches

to status/vote changes: