Quellcode durchsuchen

interface design adjustments

bmallred vor 12 Jahren
Ursprung
Commit
8c1795ff3d
2 geänderte Dateien mit 140 neuen und 26 gelöschten Zeilen
  1. 124 25
      data/ui/OrganiccodeWindow.ui
  2. 16 1
      organiccode/OrganiccodeWindow.py

+ 124 - 25
data/ui/OrganiccodeWindow.ui

3
  <!-- interface-requires gtk+ 3.0 -->
3
  <!-- interface-requires gtk+ 3.0 -->
4
  <!-- interface-requires organiccode_window 1.0 -->
4
  <!-- interface-requires organiccode_window 1.0 -->
5
  <!-- interface-local-resource-path ../media -->
5
  <!-- interface-local-resource-path ../media -->
6
  <object class="GtkAction" id="action1"/>
6
  <object class="GtkAdjustment" id="heightAdjustment">
7
  <object class="GtkAdjustment" id="heightAdjustment">
7
    <property name="lower">100</property>
8
    <property name="lower">100</property>
8
    <property name="upper">9999</property>
9
    <property name="upper">9999</property>
23
    <property name="page_increment">10</property>
24
    <property name="page_increment">10</property>
24
  </object>
25
  </object>
25
  <object class="OrganiccodeWindow" id="organiccode_window">
26
  <object class="OrganiccodeWindow" id="organiccode_window">
26
    <property name="width_request">600</property>
27
    <property name="width_request">400</property>
27
    <property name="height_request">350</property>
28
    <property name="height_request">350</property>
28
    <property name="can_focus">False</property>
29
    <property name="can_focus">False</property>
29
    <property name="title" translatable="yes">Organiccode</property>
30
    <property name="title" translatable="yes">Organiccode</property>
32
      <object class="GtkVBox" id="vbox1">
33
      <object class="GtkVBox" id="vbox1">
33
        <property name="visible">True</property>
34
        <property name="visible">True</property>
34
        <property name="can_focus">False</property>
35
        <property name="can_focus">False</property>
35
        <property name="spacing">10</property>
36
        <child>
36
        <child>
37
          <object class="GtkMenuBar" id="menubar1">
37
          <object class="GtkMenuBar" id="menubar1">
38
            <property name="visible">True</property>
38
            <property name="visible">True</property>
101
            <property name="position">0</property>
101
            <property name="position">0</property>
102
          </packing>
102
          </packing>
103
        </child>
103
        </child>
104
        <child>
105
          <object class="GtkToolbar" id="toolbar">
106
            <property name="visible">True</property>
107
            <property name="can_focus">False</property>
108
            <property name="toolbar_style">both</property>
109
            <child>
110
              <object class="GtkToolButton" id="generateButton">
111
                <property name="use_action_appearance">False</property>
112
                <property name="related_action">action1</property>
113
                <property name="visible">True</property>
114
                <property name="can_focus">False</property>
115
                <property name="tooltip_text" translatable="yes">Render the current repository</property>
116
                <property name="label" translatable="yes">Generate</property>
117
                <property name="use_underline">True</property>
118
                <property name="stock_id">gtk-apply</property>
119
              </object>
120
              <packing>
121
                <property name="expand">False</property>
122
                <property name="homogeneous">True</property>
123
              </packing>
124
            </child>
125
            <child>
126
              <object class="GtkToolButton" id="aboutButton">
127
                <property name="use_action_appearance">False</property>
128
                <property name="related_action">action1</property>
129
                <property name="visible">True</property>
130
                <property name="can_focus">False</property>
131
                <property name="tooltip_text" translatable="yes">Information about the program</property>
132
                <property name="label" translatable="yes">About</property>
133
                <property name="use_underline">True</property>
134
                <property name="stock_id">gtk-about</property>
135
              </object>
136
              <packing>
137
                <property name="expand">False</property>
138
                <property name="homogeneous">True</property>
139
              </packing>
140
            </child>
141
            <child>
142
              <object class="GtkToolButton" id="exitButton">
143
                <property name="use_action_appearance">False</property>
144
                <property name="related_action">action1</property>
145
                <property name="visible">True</property>
146
                <property name="can_focus">False</property>
147
                <property name="tooltip_text" translatable="yes">Exit</property>
148
                <property name="label" translatable="yes">Close</property>
149
                <property name="use_underline">True</property>
150
                <property name="stock_id">gtk-cancel</property>
151
              </object>
152
              <packing>
153
                <property name="expand">False</property>
154
                <property name="homogeneous">True</property>
155
              </packing>
156
            </child>
157
          </object>
158
          <packing>
159
            <property name="expand">False</property>
160
            <property name="fill">True</property>
161
            <property name="position">1</property>
162
          </packing>
163
        </child>
104
        <child>
164
        <child>
105
          <object class="GtkBox" id="box1">
165
          <object class="GtkBox" id="box1">
106
            <property name="visible">True</property>
166
            <property name="visible">True</property>
107
            <property name="can_focus">False</property>
167
            <property name="can_focus">False</property>
168
            <property name="margin_left">5</property>
169
            <property name="margin_right">5</property>
170
            <property name="margin_top">5</property>
171
            <property name="margin_bottom">5</property>
108
            <child>
172
            <child>
109
              <object class="GtkFileChooserButton" id="projectFolder">
173
              <object class="GtkLabel" id="label7">
110
                <property name="visible">True</property>
174
                <property name="visible">True</property>
111
                <property name="can_focus">False</property>
175
                <property name="can_focus">False</property>
112
                <property name="orientation">vertical</property>
113
                <property name="action">select-folder</property>
114
                <property name="create_folders">False</property>
115
                <property name="preview_widget_active">False</property>
116
                <property name="use_preview_label">False</property>
176
                <property name="margin_right">10</property>
177
                <property name="label" translatable="yes">Project directory</property>
117
              </object>
178
              </object>
118
              <packing>
179
              <packing>
119
                <property name="expand">True</property>
180
                <property name="expand">False</property>
120
                <property name="fill">True</property>
181
                <property name="fill">True</property>
121
                <property name="position">0</property>
182
                <property name="position">0</property>
122
              </packing>
183
              </packing>
123
            </child>
184
            </child>
124
            <child>
185
            <child>
125
              <object class="GtkButton" id="generateButton">
126
                <property name="label" translatable="yes">Generate</property>
186
              <object class="GtkFileChooserButton" id="projectFolder">
127
                <property name="visible">True</property>
187
                <property name="visible">True</property>
128
                <property name="can_focus">True</property>
129
                <property name="receives_default">True</property>
188
                <property name="can_focus">False</property>
189
                <property name="tooltip_text" translatable="yes">Path to the version control repository</property>
190
                <property name="orientation">vertical</property>
191
                <property name="action">select-folder</property>
192
                <property name="create_folders">False</property>
193
                <property name="preview_widget_active">False</property>
194
                <property name="use_preview_label">False</property>
130
              </object>
195
              </object>
131
              <packing>
196
              <packing>
132
                <property name="expand">True</property>
197
                <property name="expand">True</property>
138
          <packing>
203
          <packing>
139
            <property name="expand">False</property>
204
            <property name="expand">False</property>
140
            <property name="fill">True</property>
205
            <property name="fill">True</property>
141
            <property name="position">1</property>
206
            <property name="position">2</property>
142
          </packing>
207
          </packing>
143
        </child>
208
        </child>
144
        <child>
209
        <child>
154
                  <object class="GtkExpander" id="expander1">
219
                  <object class="GtkExpander" id="expander1">
155
                    <property name="visible">True</property>
220
                    <property name="visible">True</property>
156
                    <property name="can_focus">True</property>
221
                    <property name="can_focus">True</property>
222
                    <property name="margin_left">5</property>
223
                    <property name="margin_right">5</property>
224
                    <property name="margin_top">5</property>
225
                    <property name="margin_bottom">5</property>
226
                    <property name="spacing">5</property>
157
                    <child>
227
                    <child>
158
                      <object class="GtkGrid" id="grid1">
228
                      <object class="GtkGrid" id="grid1">
159
                        <property name="visible">True</property>
229
                        <property name="visible">True</property>
160
                        <property name="can_focus">False</property>
230
                        <property name="can_focus">False</property>
231
                        <property name="row_homogeneous">True</property>
232
                        <property name="column_homogeneous">True</property>
161
                        <child>
233
                        <child>
162
                          <object class="GtkCheckButton" id="fullScreen">
234
                          <object class="GtkCheckButton" id="fullScreen">
163
                            <property name="label" translatable="yes">Full Screen</property>
235
                            <property name="label" translatable="yes">Full Screen</property>
178
                          <object class="GtkBox" id="box4">
250
                          <object class="GtkBox" id="box4">
179
                            <property name="visible">True</property>
251
                            <property name="visible">True</property>
180
                            <property name="can_focus">False</property>
252
                            <property name="can_focus">False</property>
253
                            <property name="homogeneous">True</property>
181
                            <child>
254
                            <child>
182
                              <object class="GtkLabel" id="label4">
255
                              <object class="GtkLabel" id="label4">
183
                                <property name="visible">True</property>
256
                                <property name="visible">True</property>
217
                          <object class="GtkBox" id="box5">
290
                          <object class="GtkBox" id="box5">
218
                            <property name="visible">True</property>
291
                            <property name="visible">True</property>
219
                            <property name="can_focus">False</property>
292
                            <property name="can_focus">False</property>
293
                            <property name="homogeneous">True</property>
220
                            <child>
294
                            <child>
221
                              <object class="GtkLabel" id="label5">
295
                              <object class="GtkLabel" id="label5">
222
                                <property name="visible">True</property>
296
                                <property name="visible">True</property>
301
                      <object class="GtkLabel" id="label1">
375
                      <object class="GtkLabel" id="label1">
302
                        <property name="visible">True</property>
376
                        <property name="visible">True</property>
303
                        <property name="can_focus">False</property>
377
                        <property name="can_focus">False</property>
378
                        <property name="margin_left">10</property>
304
                        <property name="label" translatable="yes">Screen</property>
379
                        <property name="label" translatable="yes">Screen</property>
305
                      </object>
380
                      </object>
306
                    </child>
381
                    </child>
315
                  <object class="GtkExpander" id="expander2">
390
                  <object class="GtkExpander" id="expander2">
316
                    <property name="visible">True</property>
391
                    <property name="visible">True</property>
317
                    <property name="can_focus">True</property>
392
                    <property name="can_focus">True</property>
393
                    <property name="margin_left">5</property>
394
                    <property name="margin_right">5</property>
395
                    <property name="margin_top">5</property>
396
                    <property name="margin_bottom">5</property>
397
                    <property name="spacing">5</property>
318
                    <child>
398
                    <child>
319
                      <object class="GtkGrid" id="grid2">
399
                      <object class="GtkGrid" id="grid2">
320
                        <property name="visible">True</property>
400
                        <property name="visible">True</property>
321
                        <property name="can_focus">False</property>
401
                        <property name="can_focus">False</property>
402
                        <property name="row_homogeneous">True</property>
403
                        <property name="column_homogeneous">True</property>
322
                        <child>
404
                        <child>
323
                          <object class="GtkCheckButton" id="startPosition">
405
                          <object class="GtkCheckButton" id="startPosition">
324
                            <property name="label" translatable="yes">Start position</property>
406
                            <property name="label" translatable="yes">Start position</property>
414
                      <object class="GtkLabel" id="label3">
496
                      <object class="GtkLabel" id="label3">
415
                        <property name="visible">True</property>
497
                        <property name="visible">True</property>
416
                        <property name="can_focus">False</property>
498
                        <property name="can_focus">False</property>
499
                        <property name="margin_left">10</property>
417
                        <property name="label" translatable="yes">Timeline</property>
500
                        <property name="label" translatable="yes">Timeline</property>
418
                      </object>
501
                      </object>
419
                    </child>
502
                    </child>
428
                  <object class="GtkExpander" id="expander3">
511
                  <object class="GtkExpander" id="expander3">
429
                    <property name="visible">True</property>
512
                    <property name="visible">True</property>
430
                    <property name="can_focus">True</property>
513
                    <property name="can_focus">True</property>
514
                    <property name="margin_left">5</property>
515
                    <property name="margin_right">5</property>
516
                    <property name="margin_top">5</property>
517
                    <property name="margin_bottom">5</property>
518
                    <property name="spacing">5</property>
431
                    <child>
519
                    <child>
432
                      <object class="GtkGrid" id="grid3">
520
                      <object class="GtkGrid" id="grid3">
433
                        <property name="visible">True</property>
521
                        <property name="visible">True</property>
434
                        <property name="can_focus">False</property>
522
                        <property name="can_focus">False</property>
435
                        <child>
436
                          <placeholder/>
437
                        </child>
438
                        <child>
439
                          <placeholder/>
440
                        </child>
523
                        <property name="row_homogeneous">True</property>
524
                        <property name="column_homogeneous">True</property>
441
                        <child>
525
                        <child>
442
                          <object class="GtkCheckButton" id="key">
526
                          <object class="GtkCheckButton" id="key">
443
                            <property name="label" translatable="yes">File extension key</property>
527
                            <property name="label" translatable="yes">File extension key</property>
502
                            <property name="height">1</property>
586
                            <property name="height">1</property>
503
                          </packing>
587
                          </packing>
504
                        </child>
588
                        </child>
589
                        <child>
590
                          <placeholder/>
591
                        </child>
592
                        <child>
593
                          <placeholder/>
594
                        </child>
505
                      </object>
595
                      </object>
506
                    </child>
596
                    </child>
507
                    <child type="label">
597
                    <child type="label">
508
                      <object class="GtkLabel" id="label2">
598
                      <object class="GtkLabel" id="label2">
509
                        <property name="visible">True</property>
599
                        <property name="visible">True</property>
510
                        <property name="can_focus">False</property>
600
                        <property name="can_focus">False</property>
601
                        <property name="margin_left">10</property>
511
                        <property name="label" translatable="yes">Options</property>
602
                        <property name="label" translatable="yes">Options</property>
512
                      </object>
603
                      </object>
513
                    </child>
604
                    </child>
522
                  <object class="GtkExpander" id="expander4">
613
                  <object class="GtkExpander" id="expander4">
523
                    <property name="visible">True</property>
614
                    <property name="visible">True</property>
524
                    <property name="can_focus">True</property>
615
                    <property name="can_focus">True</property>
616
                    <property name="margin_left">5</property>
617
                    <property name="margin_right">5</property>
618
                    <property name="margin_top">5</property>
619
                    <property name="margin_bottom">5</property>
620
                    <property name="spacing">5</property>
525
                    <child>
621
                    <child>
526
                      <object class="GtkGrid" id="grid4">
622
                      <object class="GtkGrid" id="grid4">
527
                        <property name="visible">True</property>
623
                        <property name="visible">True</property>
528
                        <property name="can_focus">False</property>
624
                        <property name="can_focus">False</property>
625
                        <property name="row_homogeneous">True</property>
626
                        <property name="column_homogeneous">True</property>
529
                        <child>
627
                        <child>
530
                          <object class="GtkCheckButton" id="hideBloom">
628
                          <object class="GtkCheckButton" id="hideBloom">
531
                            <property name="label" translatable="yes">Bloom</property>
629
                            <property name="label" translatable="yes">Bloom</property>
574
                            <property name="height">1</property>
672
                            <property name="height">1</property>
575
                          </packing>
673
                          </packing>
576
                        </child>
674
                        </child>
577
                        <child>
578
                          <placeholder/>
579
                        </child>
580
                        <child>
675
                        <child>
581
                          <object class="GtkCheckButton" id="hideFiles">
676
                          <object class="GtkCheckButton" id="hideFiles">
582
                            <property name="label" translatable="yes">Files</property>
677
                            <property name="label" translatable="yes">Files</property>
705
                            <property name="height">1</property>
800
                            <property name="height">1</property>
706
                          </packing>
801
                          </packing>
707
                        </child>
802
                        </child>
803
                        <child>
804
                          <placeholder/>
805
                        </child>
708
                      </object>
806
                      </object>
709
                    </child>
807
                    </child>
710
                    <child type="label">
808
                    <child type="label">
711
                      <object class="GtkLabel" id="label6">
809
                      <object class="GtkLabel" id="label6">
712
                        <property name="visible">True</property>
810
                        <property name="visible">True</property>
713
                        <property name="can_focus">False</property>
811
                        <property name="can_focus">False</property>
812
                        <property name="margin_left">10</property>
714
                        <property name="label" translatable="yes">Hidden Elements</property>
813
                        <property name="label" translatable="yes">Hidden Elements</property>
715
                      </object>
814
                      </object>
716
                    </child>
815
                    </child>
732
          <packing>
831
          <packing>
733
            <property name="expand">True</property>
832
            <property name="expand">True</property>
734
            <property name="fill">True</property>
833
            <property name="fill">True</property>
735
            <property name="position">2</property>
834
            <property name="position">3</property>
736
          </packing>
835
          </packing>
737
        </child>
836
        </child>
738
        <child>
837
        <child>
760
            <property name="expand">False</property>
859
            <property name="expand">False</property>
761
            <property name="fill">True</property>
860
            <property name="fill">True</property>
762
            <property name="pack_type">end</property>
861
            <property name="pack_type">end</property>
763
            <property name="position">3</property>
862
            <property name="position">4</property>
764
          </packing>
863
          </packing>
765
        </child>
864
        </child>
766
      </object>
865
      </object>

+ 16 - 1
organiccode/OrganiccodeWindow.py

39
        # Code for other initialization actions should be added here.
39
        # Code for other initialization actions should be added here.
40
        self.openMenu = self.builder.get_object("mnu_open")
40
        self.openMenu = self.builder.get_object("mnu_open")
41
        self.projectFolder = self.builder.get_object("projectFolder")
41
        self.projectFolder = self.builder.get_object("projectFolder")
42
        self.generateButton = self.builder.get_object("generateButton")
43
        self.fullScreen = self.builder.get_object("fullScreen")
42
        self.fullScreen = self.builder.get_object("fullScreen")
44
        self.multiSampling = self.builder.get_object("multiSampling")
43
        self.multiSampling = self.builder.get_object("multiSampling")
45
        self.noVsync = self.builder.get_object("noVsync")
44
        self.noVsync = self.builder.get_object("noVsync")
53
        self.loop = self.builder.get_object("loop")
52
        self.loop = self.builder.get_object("loop")
54
        self.status = self.builder.get_object("status")
53
        self.status = self.builder.get_object("status")
55
54
55
        self.toolbar = self.builder.get_object("toolbar")
56
        self.generateButton = self.builder.get_object("generateButton")
57
        self.exitButton = self.builder.get_object("exitButton")
58
        self.aboutButton = self.builder.get_object("aboutButton")
59
        self.mnu_about = self.builder.get_object("mnu_about")
60
56
        self.key = self.builder.get_object("key")
61
        self.key = self.builder.get_object("key")
57
        self.highlightUsers = self.builder.get_object("highlightUsers")
62
        self.highlightUsers = self.builder.get_object("highlightUsers")
58
        self.highlightDirs = self.builder.get_object("highlightDirs")
63
        self.highlightDirs = self.builder.get_object("highlightDirs")
70
        self.hideUsers = self.builder.get_object("hideUsers")
75
        self.hideUsers = self.builder.get_object("hideUsers")
71
        self.hideUsernames = self.builder.get_object("hideUsernames")
76
        self.hideUsernames = self.builder.get_object("hideUsernames")
72
77
78
        # Style the toolbar.
79
        context = self.toolbar.get_style_context()
80
        context.add_class(Gtk.STYLE_CLASS_PRIMARY_TOOLBAR)
81
73
    def on_openMenu_clicked(self, widget):
82
    def on_openMenu_clicked(self, widget):
74
        self.projectFolder.click()
83
        self.projectFolder.click()
75
84
85
    def on_exitButton_clicked(self, widget):
86
        exit()
87
88
    def on_aboutButton_clicked(self, widget):
89
        self.mnu_about.activate()
90
76
    def on_generateButton_clicked(self, widget):
91
    def on_generateButton_clicked(self, widget):
77
        self.status.set_label("Building parameters...")
92
        self.status.set_label("Building parameters...")
78
93