Merge lp:~mbudde/lernid/ui-polish into lp:lernid
- ui-polish
- Merge into trunk
Proposed by
Michael Budde
| Status: | Merged |
|---|---|
| Merged at revision: | not available |
| Proposed branch: | lp:~mbudde/lernid/ui-polish |
| Merge into: | lp:lernid |
| Diff against target: |
702 lines (+266/-182) 4 files modified
bin/lernid (+27/-8) data/ui/ConnectDialog.ui (+12/-6) data/ui/LernidWindow.ui (+226/-168) lernid/ConnectDialog.py (+1/-0) |
| To merge this branch: | bzr merge lp:~mbudde/lernid/ui-polish |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Jono Bacon | Needs Fixing | ||
|
Review via email:
|
|||
Commit message
Description of the change
To post a comment you must log in.
Revision history for this message
| Michael Budde (mbudde) wrote : | # |
Revision history for this message
| Jono Bacon (jonobacon) wrote : | # |
Thanks for your work, Michael. There have been some changes since you worked on this. Could you update the patch to current trunk. Thanks!
review:
Needs Fixing
Revision history for this message
| Jono Bacon (jonobacon) wrote : | # |
Actually, Michael, I can merge these changes in myself. Thanks for the contribution!
lp:~mbudde/lernid/ui-polish
updated
- 75. By Michael Budde
-
merge lp:lernid
- 76. By Michael Budde
-
Add Statusbar item in View menu
Revision history for this message
| Michael Budde (mbudde) wrote : | # |
As the fullscreen branch have been merge, I've made one more change to add a Statusbar menu item in the View menu.
Revision history for this message
| Jono Bacon (jonobacon) wrote : | # |
I tried to merge in your changes and they merge cleanly, but when I try to change slides with [SLIDE 1] or [SLIDE 2], this no longer works. Could you take a look to see what is breaking this and fix this? Thanks!
lp:~mbudde/lernid/ui-polish
updated
- 77. By Michael Budde
-
* Fix slideshow
* Retain aspect ratio of slide image (WIP)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
| 1 | === modified file 'bin/lernid' |
| 2 | --- bin/lernid 2009-12-23 13:30:59 +0000 |
| 3 | +++ bin/lernid 2009-12-23 16:37:10 +0000 |
| 4 | @@ -117,7 +117,10 @@ |
| 5 | self.TAB_SCHEDULE = 0 |
| 6 | self.TAB_BROWSER = 1 |
| 7 | |
| 8 | - # create browser widget |
| 9 | + # set up statusbar |
| 10 | + self.statusbar = self.builder.get_object('statusbar') |
| 11 | + |
| 12 | + # create browser widget |
| 13 | self.browser = gtkmozembed.MozEmbed() |
| 14 | self.browser.connect("title", self.update_browser_title_combo) |
| 15 | |
| 16 | @@ -125,6 +128,7 @@ |
| 17 | self.chat.set_flags(gtk.HAS_FOCUS) |
| 18 | |
| 19 | self.browser_scroll.add_with_viewport(self.browser) |
| 20 | + self.browser_scroll.get_child().set_property('shadow-type', gtk.SHADOW_NONE) |
| 21 | self.chat_scroll.add_with_viewport(self.chat) |
| 22 | |
| 23 | self.eventhomepage = None |
| 24 | @@ -137,7 +141,7 @@ |
| 25 | self.chat.hide() |
| 26 | |
| 27 | self.master_slide = None |
| 28 | - self.tempslide = tempfile.TemporaryFile() |
| 29 | + self.tempslide = tempfile.NamedTemporaryFile() |
| 30 | |
| 31 | self.firstrun = True |
| 32 | self.currentsession_title = None |
| 33 | @@ -149,12 +153,14 @@ |
| 34 | def change_slide(self, slidenumber): |
| 35 | firstpage = "-dFirstPage=" + str(slidenumber) |
| 36 | lastpage = "-dLastPage=" + str(slidenumber) |
| 37 | - outputfile = "-sOutputFile=" + str(self.tempslide) |
| 38 | + outputfile = "-sOutputFile=" + self.tempslide.name |
| 39 | slidedeck = os.path.join(self.lernidfolder, "slides.pdf") |
| 40 | |
| 41 | + print 'output file', outputfile |
| 42 | subprocess.Popen(['gs', '-dNOPAUSE', firstpage, lastpage, '-dBATCH', '-sDEVICE=jpeg', outputfile, '-r200', slidedeck]).wait() |
| 43 | |
| 44 | - self.master_slide = gtk.gdk.pixbuf_new_from_file(str(self.tempslide)) |
| 45 | + self.master_slide = gtk.gdk.pixbuf_new_from_file(self.tempslide.name) |
| 46 | + self.slide_resize() |
| 47 | self.tabs.set_current_page(self.TAB_SCHEDULE) |
| 48 | |
| 49 | def classroom_log_changed(self, monitor, file1, file2, evt_type): |
| 50 | @@ -189,9 +195,15 @@ |
| 51 | self.classroom_textview.get_buffer().insert(self.classroom_textview.get_buffer().get_end_iter(), linelist[len(linelist)-1]) |
| 52 | self.classroom_scrollbar.set_value(self.classroom_scrollbar.upper) |
| 53 | |
| 54 | - def slide_resize(self, widget, data=None): |
| 55 | + def slide_resize(self, widget=None, data=None): |
| 56 | if self.master_slide is not None: |
| 57 | - newpb = gtk.gdk.Pixbuf.scale_simple(self.master_slide, self.slide_scroll.allocation.width, self.slide_scroll.allocation.height, gtk.gdk.INTERP_BILINEAR) |
| 58 | + mwidth, mheight = self.master_slide.get_width(), self.master_slide.get_height() |
| 59 | + width, height = self.slide_scroll.allocation.width, self.slide_scroll.allocation.height |
| 60 | + if width < height: |
| 61 | + height = int(float(width)/float(mwidth)*mheight) |
| 62 | + else: |
| 63 | + width = int(float(height)/float(mheight)*mwidth) |
| 64 | + newpb = gtk.gdk.Pixbuf.scale_simple(self.master_slide, width, height, gtk.gdk.INTERP_BILINEAR) |
| 65 | self.slide_image.clear() |
| 66 | self.slide_image.set_from_pixbuf(newpb) |
| 67 | self.slide_image.show() |
| 68 | @@ -422,8 +434,9 @@ |
| 69 | |
| 70 | def connect_to_resources(self): |
| 71 | """Connect to the currently selected event.""" |
| 72 | - |
| 73 | - self.builder.get_object("statusbar").set_text(_("Connected to ") + self.event) |
| 74 | + |
| 75 | + context_id = self.statusbar.get_context_id('event') |
| 76 | + self.statusbar.push(context_id, _('Connected to ') + self.event) |
| 77 | self.send_notification(_("Connected to ") + self.event) |
| 78 | |
| 79 | config = ConfigParser.ConfigParser() |
| 80 | @@ -526,6 +539,12 @@ |
| 81 | else: |
| 82 | self.unfullscreen() |
| 83 | |
| 84 | + def toggle_statusbar(self, menuitem): |
| 85 | + if menuitem.get_active(): |
| 86 | + self.statusbar.show() |
| 87 | + else: |
| 88 | + self.statusbar.hide() |
| 89 | + |
| 90 | def NewLernidWindow(): |
| 91 | """NewLernidWindow - returns a fully instantiated |
| 92 | LernidWindow object. Use this function rather than |
| 93 | |
| 94 | === modified file 'data/ui/ConnectDialog.ui' |
| 95 | --- data/ui/ConnectDialog.ui 2009-11-30 17:55:18 +0000 |
| 96 | +++ data/ui/ConnectDialog.ui 2009-12-23 16:37:10 +0000 |
| 97 | @@ -4,7 +4,7 @@ |
| 98 | <!-- interface-requires connect_dialog 1.0 --> |
| 99 | <!-- interface-naming-policy project-wide --> |
| 100 | <object class="ConnectDialog" id="connect_dialog"> |
| 101 | - <property name="border_width">5</property> |
| 102 | + <property name="border_width">6</property> |
| 103 | <property name="title" translatable="yes">Choose an event</property> |
| 104 | <property name="resizable">False</property> |
| 105 | <property name="modal">True</property> |
| 106 | @@ -20,10 +20,10 @@ |
| 107 | <object class="GtkVBox" id="dialog-vbox1"> |
| 108 | <property name="visible">True</property> |
| 109 | <property name="orientation">vertical</property> |
| 110 | - <property name="spacing">2</property> |
| 111 | <child> |
| 112 | <object class="GtkVBox" id="vbox1"> |
| 113 | <property name="visible">True</property> |
| 114 | + <property name="border_width">6</property> |
| 115 | <property name="orientation">vertical</property> |
| 116 | <child> |
| 117 | <object class="GtkImage" id="image1"> |
| 118 | @@ -38,29 +38,33 @@ |
| 119 | <property name="visible">True</property> |
| 120 | <property name="n_rows">2</property> |
| 121 | <property name="n_columns">2</property> |
| 122 | + <property name="column_spacing">12</property> |
| 123 | + <property name="row_spacing">6</property> |
| 124 | <child> |
| 125 | <object class="GtkLabel" id="label1"> |
| 126 | <property name="visible">True</property> |
| 127 | + <property name="xalign">0</property> |
| 128 | <property name="xpad">3</property> |
| 129 | <property name="ypad">3</property> |
| 130 | - <property name="label" translatable="yes">Event</property> |
| 131 | + <property name="label" translatable="yes">Event:</property> |
| 132 | </object> |
| 133 | <packing> |
| 134 | - <property name="x_options"></property> |
| 135 | + <property name="x_options">GTK_FILL</property> |
| 136 | <property name="y_options"></property> |
| 137 | </packing> |
| 138 | </child> |
| 139 | <child> |
| 140 | <object class="GtkLabel" id="label2"> |
| 141 | <property name="visible">True</property> |
| 142 | + <property name="xalign">0</property> |
| 143 | <property name="xpad">3</property> |
| 144 | <property name="ypad">3</property> |
| 145 | - <property name="label" translatable="yes">Nickname</property> |
| 146 | + <property name="label" translatable="yes">Nickname:</property> |
| 147 | </object> |
| 148 | <packing> |
| 149 | <property name="top_attach">1</property> |
| 150 | <property name="bottom_attach">2</property> |
| 151 | - <property name="x_options"></property> |
| 152 | + <property name="x_options">GTK_FILL</property> |
| 153 | <property name="y_options"></property> |
| 154 | </packing> |
| 155 | </child> |
| 156 | @@ -79,6 +83,7 @@ |
| 157 | <object class="GtkEntry" id="nick_textentry"> |
| 158 | <property name="visible">True</property> |
| 159 | <property name="can_focus">True</property> |
| 160 | + <property name="invisible_char">●</property> |
| 161 | <property name="activates_default">True</property> |
| 162 | <signal name="changed" handler="check_ready_to_connect"/> |
| 163 | </object> |
| 164 | @@ -92,6 +97,7 @@ |
| 165 | </child> |
| 166 | </object> |
| 167 | <packing> |
| 168 | + <property name="expand">False</property> |
| 169 | <property name="position">1</property> |
| 170 | </packing> |
| 171 | </child> |
| 172 | |
| 173 | === modified file 'data/ui/LernidWindow.ui' |
| 174 | --- data/ui/LernidWindow.ui 2009-12-23 12:07:23 +0000 |
| 175 | +++ data/ui/LernidWindow.ui 2009-12-23 16:37:10 +0000 |
| 176 | @@ -14,7 +14,6 @@ |
| 177 | <object class="GtkVBox" id="main_vbox"> |
| 178 | <property name="visible">True</property> |
| 179 | <property name="orientation">vertical</property> |
| 180 | - <property name="spacing">5</property> |
| 181 | <child> |
| 182 | <object class="GtkMenuBar" id="menubar1"> |
| 183 | <property name="visible">True</property> |
| 184 | @@ -81,6 +80,15 @@ |
| 185 | <signal name="toggled" handler="toggle_fullscreen"/> |
| 186 | </object> |
| 187 | </child> |
| 188 | + <child> |
| 189 | + <object class="GtkCheckMenuItem" id="menu_statusbar"> |
| 190 | + <property name="visible">True</property> |
| 191 | + <property name="label" translatable="yes">_Statusbar</property> |
| 192 | + <property name="use_underline">True</property> |
| 193 | + <property name="active">True</property> |
| 194 | + <signal name="toggled" handler="toggle_statusbar"/> |
| 195 | + </object> |
| 196 | + </child> |
| 197 | </object> |
| 198 | </child> |
| 199 | </object> |
| 200 | @@ -113,32 +121,42 @@ |
| 201 | </packing> |
| 202 | </child> |
| 203 | <child> |
| 204 | - <object class="GtkVPaned" id="vpaned1"> |
| 205 | + <object class="GtkAlignment" id="alignment1"> |
| 206 | <property name="visible">True</property> |
| 207 | - <property name="can_focus">True</property> |
| 208 | - <property name="orientation">vertical</property> |
| 209 | + <property name="top_padding">6</property> |
| 210 | + <property name="bottom_padding">6</property> |
| 211 | + <property name="left_padding">6</property> |
| 212 | + <property name="right_padding">6</property> |
| 213 | <child> |
| 214 | - <object class="GtkNotebook" id="tabs"> |
| 215 | + <object class="GtkVPaned" id="vpaned1"> |
| 216 | <property name="visible">True</property> |
| 217 | <property name="can_focus">True</property> |
| 218 | + <property name="orientation">vertical</property> |
| 219 | <child> |
| 220 | - <object class="GtkScrolledWindow" id="schedule_scroll"> |
| 221 | + <object class="GtkNotebook" id="tabs"> |
| 222 | <property name="visible">True</property> |
| 223 | <property name="can_focus">True</property> |
| 224 | - <property name="hscrollbar_policy">automatic</property> |
| 225 | - <property name="vscrollbar_policy">automatic</property> |
| 226 | <child> |
| 227 | <object class="GtkHPaned" id="hpaned2"> |
| 228 | <property name="visible">True</property> |
| 229 | <property name="can_focus">True</property> |
| 230 | <signal name="expose_event" handler="slide_resize"/> |
| 231 | <child> |
| 232 | - <object class="GtkTreeView" id="schedule_tv"> |
| 233 | + <object class="GtkScrolledWindow" id="schedule_scroll"> |
| 234 | + <property name="width_request">600</property> |
| 235 | <property name="visible">True</property> |
| 236 | <property name="can_focus">True</property> |
| 237 | + <property name="hscrollbar_policy">automatic</property> |
| 238 | + <property name="vscrollbar_policy">automatic</property> |
| 239 | + <child> |
| 240 | + <object class="GtkTreeView" id="schedule_tv"> |
| 241 | + <property name="visible">True</property> |
| 242 | + <property name="can_focus">True</property> |
| 243 | + </object> |
| 244 | + </child> |
| 245 | </object> |
| 246 | <packing> |
| 247 | - <property name="resize">False</property> |
| 248 | + <property name="resize">True</property> |
| 249 | <property name="shrink">True</property> |
| 250 | </packing> |
| 251 | </child> |
| 252 | @@ -149,11 +167,18 @@ |
| 253 | <property name="hscrollbar_policy">never</property> |
| 254 | <property name="vscrollbar_policy">never</property> |
| 255 | <child> |
| 256 | - <object class="GtkImage" id="slide_image"> |
| 257 | - <property name="width_request">200</property> |
| 258 | - <property name="height_request">200</property> |
| 259 | + <object class="GtkViewport" id="slide_img_viewport"> |
| 260 | <property name="visible">True</property> |
| 261 | - <property name="stock">gtk-missing-image</property> |
| 262 | + <property name="resize_mode">queue</property> |
| 263 | + <property name="shadow_type">none</property> |
| 264 | + <child> |
| 265 | + <object class="GtkImage" id="slide_image"> |
| 266 | + <property name="width_request">200</property> |
| 267 | + <property name="height_request">200</property> |
| 268 | + <property name="visible">True</property> |
| 269 | + <property name="stock">gtk-missing-image</property> |
| 270 | + </object> |
| 271 | + </child> |
| 272 | </object> |
| 273 | </child> |
| 274 | </object> |
| 275 | @@ -164,35 +189,83 @@ |
| 276 | </child> |
| 277 | </object> |
| 278 | </child> |
| 279 | - </object> |
| 280 | - </child> |
| 281 | - <child type="tab"> |
| 282 | - <object class="GtkLabel" id="tab_schedule"> |
| 283 | - <property name="visible">True</property> |
| 284 | - <property name="label" translatable="yes">Session</property> |
| 285 | - <attributes> |
| 286 | - <attribute name="weight" value="bold"/> |
| 287 | - </attributes> |
| 288 | - </object> |
| 289 | - <packing> |
| 290 | - <property name="tab_fill">False</property> |
| 291 | - </packing> |
| 292 | - </child> |
| 293 | - <child> |
| 294 | - <object class="GtkVBox" id="vbox1"> |
| 295 | - <property name="visible">True</property> |
| 296 | - <property name="orientation">vertical</property> |
| 297 | + <child type="tab"> |
| 298 | + <object class="GtkLabel" id="tab_schedule"> |
| 299 | + <property name="visible">True</property> |
| 300 | + <property name="label" translatable="yes">Session</property> |
| 301 | + <attributes> |
| 302 | + <attribute name="weight" value="bold"/> |
| 303 | + </attributes> |
| 304 | + </object> |
| 305 | + <packing> |
| 306 | + <property name="tab_fill">False</property> |
| 307 | + </packing> |
| 308 | + </child> |
| 309 | <child> |
| 310 | - <object class="GtkHBox" id="hbox1"> |
| 311 | + <object class="GtkVBox" id="vbox1"> |
| 312 | <property name="visible">True</property> |
| 313 | + <property name="orientation">vertical</property> |
| 314 | <child> |
| 315 | - <object class="GtkButton" id="browser_refresh"> |
| 316 | - <property name="label">gtk-refresh</property> |
| 317 | + <object class="GtkAlignment" id="alignment2"> |
| 318 | <property name="visible">True</property> |
| 319 | - <property name="can_focus">True</property> |
| 320 | - <property name="receives_default">True</property> |
| 321 | - <property name="use_stock">True</property> |
| 322 | - <signal name="clicked" handler="browser_refresh"/> |
| 323 | + <property name="top_padding">2</property> |
| 324 | + <property name="bottom_padding">2</property> |
| 325 | + <property name="left_padding">2</property> |
| 326 | + <property name="right_padding">2</property> |
| 327 | + <child> |
| 328 | + <object class="GtkHBox" id="hbox1"> |
| 329 | + <property name="visible">True</property> |
| 330 | + <child> |
| 331 | + <object class="GtkButton" id="browser_refresh"> |
| 332 | + <property name="visible">True</property> |
| 333 | + <property name="can_focus">True</property> |
| 334 | + <property name="receives_default">True</property> |
| 335 | + <property name="relief">none</property> |
| 336 | + <signal name="clicked" handler="browser_refresh"/> |
| 337 | + <child> |
| 338 | + <object class="GtkImage" id="image1"> |
| 339 | + <property name="visible">True</property> |
| 340 | + <property name="stock">gtk-refresh</property> |
| 341 | + </object> |
| 342 | + </child> |
| 343 | + </object> |
| 344 | + <packing> |
| 345 | + <property name="expand">False</property> |
| 346 | + <property name="fill">False</property> |
| 347 | + <property name="position">0</property> |
| 348 | + </packing> |
| 349 | + </child> |
| 350 | + <child> |
| 351 | + <object class="GtkButton" id="browser_stop"> |
| 352 | + <property name="visible">True</property> |
| 353 | + <property name="can_focus">True</property> |
| 354 | + <property name="receives_default">True</property> |
| 355 | + <property name="relief">none</property> |
| 356 | + <signal name="clicked" handler="browser_stop"/> |
| 357 | + <child> |
| 358 | + <object class="GtkImage" id="image2"> |
| 359 | + <property name="visible">True</property> |
| 360 | + <property name="stock">gtk-stop</property> |
| 361 | + </object> |
| 362 | + </child> |
| 363 | + </object> |
| 364 | + <packing> |
| 365 | + <property name="expand">False</property> |
| 366 | + <property name="fill">False</property> |
| 367 | + <property name="position">1</property> |
| 368 | + </packing> |
| 369 | + </child> |
| 370 | + <child> |
| 371 | + <object class="GtkComboBox" id="browser_combo"> |
| 372 | + <property name="visible">True</property> |
| 373 | + <signal name="changed" handler="select_browser_title"/> |
| 374 | + </object> |
| 375 | + <packing> |
| 376 | + <property name="position">2</property> |
| 377 | + </packing> |
| 378 | + </child> |
| 379 | + </object> |
| 380 | + </child> |
| 381 | </object> |
| 382 | <packing> |
| 383 | <property name="expand">False</property> |
| 384 | @@ -201,24 +274,23 @@ |
| 385 | </packing> |
| 386 | </child> |
| 387 | <child> |
| 388 | - <object class="GtkButton" id="browser_stop"> |
| 389 | - <property name="label">gtk-stop</property> |
| 390 | + <object class="GtkHSeparator" id="hseparator1"> |
| 391 | <property name="visible">True</property> |
| 392 | - <property name="can_focus">True</property> |
| 393 | - <property name="receives_default">True</property> |
| 394 | - <property name="use_stock">True</property> |
| 395 | - <signal name="clicked" handler="browser_stop"/> |
| 396 | </object> |
| 397 | <packing> |
| 398 | <property name="expand">False</property> |
| 399 | - <property name="fill">False</property> |
| 400 | <property name="position">1</property> |
| 401 | </packing> |
| 402 | </child> |
| 403 | <child> |
| 404 | - <object class="GtkComboBox" id="browser_combo"> |
| 405 | + <object class="GtkScrolledWindow" id="browser_scroll"> |
| 406 | <property name="visible">True</property> |
| 407 | - <signal name="changed" handler="select_browser_title"/> |
| 408 | + <property name="can_focus">True</property> |
| 409 | + <property name="hscrollbar_policy">automatic</property> |
| 410 | + <property name="vscrollbar_policy">automatic</property> |
| 411 | + <child> |
| 412 | + <placeholder/> |
| 413 | + </child> |
| 414 | </object> |
| 415 | <packing> |
| 416 | <property name="position">2</property> |
| 417 | @@ -226,114 +298,118 @@ |
| 418 | </child> |
| 419 | </object> |
| 420 | <packing> |
| 421 | - <property name="expand">False</property> |
| 422 | - <property name="fill">False</property> |
| 423 | - <property name="position">0</property> |
| 424 | - </packing> |
| 425 | - </child> |
| 426 | - <child> |
| 427 | - <object class="GtkScrolledWindow" id="browser_scroll"> |
| 428 | - <property name="visible">True</property> |
| 429 | - <property name="can_focus">True</property> |
| 430 | - <property name="hscrollbar_policy">automatic</property> |
| 431 | - <property name="vscrollbar_policy">automatic</property> |
| 432 | - <child> |
| 433 | - <placeholder/> |
| 434 | - </child> |
| 435 | - </object> |
| 436 | - <packing> |
| 437 | <property name="position">1</property> |
| 438 | </packing> |
| 439 | </child> |
| 440 | - </object> |
| 441 | - <packing> |
| 442 | - <property name="position">1</property> |
| 443 | - </packing> |
| 444 | - </child> |
| 445 | - <child type="tab"> |
| 446 | - <object class="GtkLabel" id="tab_browser"> |
| 447 | - <property name="visible">True</property> |
| 448 | - <property name="label" translatable="yes">Browser</property> |
| 449 | - <attributes> |
| 450 | - <attribute name="weight" value="bold"/> |
| 451 | - </attributes> |
| 452 | - </object> |
| 453 | - <packing> |
| 454 | - <property name="position">1</property> |
| 455 | - <property name="tab_fill">False</property> |
| 456 | - </packing> |
| 457 | - </child> |
| 458 | - <child> |
| 459 | - <placeholder/> |
| 460 | - </child> |
| 461 | - <child type="tab"> |
| 462 | - <placeholder/> |
| 463 | - </child> |
| 464 | - </object> |
| 465 | - <packing> |
| 466 | - <property name="resize">False</property> |
| 467 | - <property name="shrink">True</property> |
| 468 | - </packing> |
| 469 | - </child> |
| 470 | - <child> |
| 471 | - <object class="GtkHPaned" id="hpaned1"> |
| 472 | - <property name="visible">True</property> |
| 473 | - <property name="can_focus">True</property> |
| 474 | - <child> |
| 475 | - <object class="GtkFrame" id="frame_classroom"> |
| 476 | - <property name="visible">True</property> |
| 477 | - <property name="label_xalign">0</property> |
| 478 | - <property name="shadow_type">none</property> |
| 479 | - <child> |
| 480 | - <object class="GtkScrolledWindow" id="classroom_scroll"> |
| 481 | - <property name="visible">True</property> |
| 482 | - <property name="can_focus">True</property> |
| 483 | - <property name="vadjustment">adjustment1</property> |
| 484 | - <property name="hscrollbar_policy">automatic</property> |
| 485 | - <property name="vscrollbar_policy">automatic</property> |
| 486 | - <child> |
| 487 | - <object class="GtkTextView" id="classroom_textview"> |
| 488 | - <property name="width_request">250</property> |
| 489 | - <property name="visible">True</property> |
| 490 | - <property name="can_focus">True</property> |
| 491 | - <property name="pixels_above_lines">1</property> |
| 492 | - <property name="pixels_below_lines">1</property> |
| 493 | - <property name="editable">False</property> |
| 494 | - <property name="wrap_mode">word</property> |
| 495 | - <property name="left_margin">10</property> |
| 496 | - <property name="right_margin">10</property> |
| 497 | - <property name="cursor_visible">False</property> |
| 498 | - </object> |
| 499 | - </child> |
| 500 | - </object> |
| 501 | - </child> |
| 502 | - <child type="label"> |
| 503 | - <object class="GtkLabel" id="label4"> |
| 504 | - <property name="visible">True</property> |
| 505 | - <property name="xpad">3</property> |
| 506 | - <property name="ypad">2</property> |
| 507 | - <property name="label" translatable="yes">Classroom</property> |
| 508 | - <property name="justify">fill</property> |
| 509 | + <child type="tab"> |
| 510 | + <object class="GtkLabel" id="tab_browser"> |
| 511 | + <property name="visible">True</property> |
| 512 | + <property name="label" translatable="yes">Browser</property> |
| 513 | <attributes> |
| 514 | <attribute name="weight" value="bold"/> |
| 515 | </attributes> |
| 516 | </object> |
| 517 | + <packing> |
| 518 | + <property name="position">1</property> |
| 519 | + <property name="tab_fill">False</property> |
| 520 | + </packing> |
| 521 | + </child> |
| 522 | + <child> |
| 523 | + <placeholder/> |
| 524 | + </child> |
| 525 | + <child type="tab"> |
| 526 | + <placeholder/> |
| 527 | </child> |
| 528 | </object> |
| 529 | <packing> |
| 530 | - <property name="resize">False</property> |
| 531 | + <property name="resize">True</property> |
| 532 | <property name="shrink">True</property> |
| 533 | </packing> |
| 534 | </child> |
| 535 | <child> |
| 536 | - <object class="GtkFrame" id="frame2"> |
| 537 | + <object class="GtkHPaned" id="hpaned1"> |
| 538 | <property name="visible">True</property> |
| 539 | - <property name="label_xalign">0</property> |
| 540 | - <property name="shadow_type">none</property> |
| 541 | - <child> |
| 542 | - <object class="GtkAlignment" id="alignment1"> |
| 543 | - <property name="visible">True</property> |
| 544 | - <property name="left_padding">12</property> |
| 545 | + <property name="can_focus">True</property> |
| 546 | + <child> |
| 547 | + <object class="GtkVBox" id="classroom_vbox"> |
| 548 | + <property name="visible">True</property> |
| 549 | + <property name="orientation">vertical</property> |
| 550 | + <child> |
| 551 | + <object class="GtkLabel" id="label4"> |
| 552 | + <property name="visible">True</property> |
| 553 | + <property name="xalign">0</property> |
| 554 | + <property name="xpad">6</property> |
| 555 | + <property name="ypad">3</property> |
| 556 | + <property name="label" translatable="yes">Classroom</property> |
| 557 | + <property name="justify">fill</property> |
| 558 | + <attributes> |
| 559 | + <attribute name="weight" value="bold"/> |
| 560 | + </attributes> |
| 561 | + </object> |
| 562 | + <packing> |
| 563 | + <property name="expand">False</property> |
| 564 | + <property name="position">0</property> |
| 565 | + </packing> |
| 566 | + </child> |
| 567 | + <child> |
| 568 | + <object class="GtkViewport" id="classroom_viewport"> |
| 569 | + <property name="visible">True</property> |
| 570 | + <property name="resize_mode">queue</property> |
| 571 | + <child> |
| 572 | + <object class="GtkScrolledWindow" id="classroom_scroll"> |
| 573 | + <property name="width_request">250</property> |
| 574 | + <property name="visible">True</property> |
| 575 | + <property name="can_focus">True</property> |
| 576 | + <property name="vadjustment">adjustment1</property> |
| 577 | + <property name="hscrollbar_policy">automatic</property> |
| 578 | + <property name="vscrollbar_policy">automatic</property> |
| 579 | + <child> |
| 580 | + <object class="GtkTextView" id="classroom_textview"> |
| 581 | + <property name="visible">True</property> |
| 582 | + <property name="can_focus">True</property> |
| 583 | + <property name="pixels_above_lines">1</property> |
| 584 | + <property name="pixels_below_lines">1</property> |
| 585 | + <property name="editable">False</property> |
| 586 | + <property name="wrap_mode">word</property> |
| 587 | + <property name="left_margin">10</property> |
| 588 | + <property name="right_margin">10</property> |
| 589 | + <property name="cursor_visible">False</property> |
| 590 | + </object> |
| 591 | + </child> |
| 592 | + </object> |
| 593 | + </child> |
| 594 | + </object> |
| 595 | + <packing> |
| 596 | + <property name="position">1</property> |
| 597 | + </packing> |
| 598 | + </child> |
| 599 | + </object> |
| 600 | + <packing> |
| 601 | + <property name="resize">False</property> |
| 602 | + <property name="shrink">True</property> |
| 603 | + </packing> |
| 604 | + </child> |
| 605 | + <child> |
| 606 | + <object class="GtkVBox" id="chatroom_vbox"> |
| 607 | + <property name="visible">True</property> |
| 608 | + <property name="orientation">vertical</property> |
| 609 | + <child> |
| 610 | + <object class="GtkLabel" id="label5"> |
| 611 | + <property name="visible">True</property> |
| 612 | + <property name="xalign">0</property> |
| 613 | + <property name="xpad">6</property> |
| 614 | + <property name="ypad">3</property> |
| 615 | + <property name="label" translatable="yes">Chatroom</property> |
| 616 | + <property name="justify">fill</property> |
| 617 | + <attributes> |
| 618 | + <attribute name="weight" value="bold"/> |
| 619 | + </attributes> |
| 620 | + </object> |
| 621 | + <packing> |
| 622 | + <property name="expand">False</property> |
| 623 | + <property name="position">0</property> |
| 624 | + </packing> |
| 625 | + </child> |
| 626 | <child> |
| 627 | <object class="GtkScrolledWindow" id="chat_scroll"> |
| 628 | <property name="visible">True</property> |
| 629 | @@ -344,20 +420,15 @@ |
| 630 | <placeholder/> |
| 631 | </child> |
| 632 | </object> |
| 633 | + <packing> |
| 634 | + <property name="position">1</property> |
| 635 | + </packing> |
| 636 | </child> |
| 637 | </object> |
| 638 | - </child> |
| 639 | - <child type="label"> |
| 640 | - <object class="GtkLabel" id="label5"> |
| 641 | - <property name="visible">True</property> |
| 642 | - <property name="xpad">3</property> |
| 643 | - <property name="ypad">3</property> |
| 644 | - <property name="label" translatable="yes">Chatroom</property> |
| 645 | - <property name="justify">fill</property> |
| 646 | - <attributes> |
| 647 | - <attribute name="weight" value="bold"/> |
| 648 | - </attributes> |
| 649 | - </object> |
| 650 | + <packing> |
| 651 | + <property name="resize">True</property> |
| 652 | + <property name="shrink">True</property> |
| 653 | + </packing> |
| 654 | </child> |
| 655 | </object> |
| 656 | <packing> |
| 657 | @@ -366,10 +437,6 @@ |
| 658 | </packing> |
| 659 | </child> |
| 660 | </object> |
| 661 | - <packing> |
| 662 | - <property name="resize">True</property> |
| 663 | - <property name="shrink">True</property> |
| 664 | - </packing> |
| 665 | </child> |
| 666 | </object> |
| 667 | <packing> |
| 668 | @@ -377,20 +444,11 @@ |
| 669 | </packing> |
| 670 | </child> |
| 671 | <child> |
| 672 | - <object class="GtkStatusbar" id="statusbar1"> |
| 673 | + <object class="GtkStatusbar" id="statusbar"> |
| 674 | <property name="visible">True</property> |
| 675 | <property name="spacing">2</property> |
| 676 | <child> |
| 677 | - <object class="GtkLabel" id="statusbar"> |
| 678 | - <property name="visible">True</property> |
| 679 | - <property name="xalign">0</property> |
| 680 | - <property name="xpad">5</property> |
| 681 | - <property name="ypad">5</property> |
| 682 | - <property name="label" translatable="yes">Not Connected.</property> |
| 683 | - </object> |
| 684 | - <packing> |
| 685 | - <property name="position">0</property> |
| 686 | - </packing> |
| 687 | + <placeholder/> |
| 688 | </child> |
| 689 | </object> |
| 690 | <packing> |
| 691 | |
| 692 | === modified file 'lernid/ConnectDialog.py' |
| 693 | --- lernid/ConnectDialog.py 2009-12-15 12:32:43 +0000 |
| 694 | +++ lernid/ConnectDialog.py 2009-12-23 16:37:10 +0000 |
| 695 | @@ -93,6 +93,7 @@ |
| 696 | cell = gtk.CellRendererText() |
| 697 | self.event_combo.pack_start(cell, True) |
| 698 | self.event_combo.add_attribute(cell, 'text',0) |
| 699 | + self.event_combo.set_active(0) |
| 700 | |
| 701 | def ok(self, widget, data=None): |
| 702 | """ok - The user has elected to save the changes. |
I have made a couple of improvements to the UI to make it look better and make it more HIG conforming. Most changes are to the glade files, only a couple is in the code.