gergely/astrognome
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update the Edit tab UI

Browse Source 
* Controls moved to more sane positions
* House system drop down moved to the chart toolbar
This commit is contained in:
Gergely Polonkai 2014-09-28 22:58:52 +02:00
parent d65ae8a504
commit c0608379f1
2 changed files with 409 additions and 367 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
help/C/figures/chart-edit.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 41 KiB

After

Width:  |  Height:  |  Size: 27 KiB

232
src/resources/ui/ag-window.ui
View File

@ -366,7 +366,7 @@
<object class="GtkLabel" id="name_label"> <object class="GtkLabel" id="name_label">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="label" translatable="yes" context="Chart edit, Name label">Name</property> <property name="label" translatable="yes">Name</property>
</object> </object>
<packing> <packing>
<property name="left_attach">0</property> <property name="left_attach">0</property>
@ -382,18 +382,37 @@
<packing> <packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>
<property name="top_attach">0</property> <property name="top_attach">0</property>
<property name="width">6</property> <property name="width">2</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkFrame" id="location_frame">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child type="label">
<object class="GtkLabel" id="location_frame_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Location</property>
</object>
</child>
<child>
<object class="GtkGrid" id="location_grid">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child> <child>
<object class="GtkLabel" id="country_label"> <object class="GtkLabel" id="country_label">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="label" translatable="yes" context="Chart edit, Country label">Country</property> <property name="label" translatable="yes">Country</property>
</object> </object>
<packing> <packing>
<property name="left_attach">0</property> <property name="left_attach">0</property>
<property name="top_attach">1</property> <property name="top_attach">0</property>
<property name="width">2</property>
<property name="height">1</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -406,20 +425,21 @@
<signal name="search-changed" handler="ag_window_country_changed_callback" swapped="no"/> <signal name="search-changed" handler="ag_window_country_changed_callback" swapped="no"/>
</object> </object>
<packing> <packing>
<property name="left_attach">1</property> <property name="left_attach">0</property>
<property name="top_attach">1</property> <property name="top_attach">1</property>
<property name="width">3</property> <property name="width">2</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkLabel" id="city_label"> <object class="GtkLabel" id="city_label">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="label" translatable="yes" context="Chart edit, City label">City</property> <property name="label" translatable="yes">City</property>
</object> </object>
<packing> <packing>
<property name="left_attach">0</property> <property name="left_attach">2</property>
<property name="top_attach">2</property> <property name="top_attach">0</property>
<property name="width">2</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -432,52 +452,51 @@
<signal name="search-changed" handler="ag_window_city_changed_callback" swapped="no"/> <signal name="search-changed" handler="ag_window_city_changed_callback" swapped="no"/>
</object> </object>
<packing> <packing>
<property name="left_attach">1</property> <property name="left_attach">2</property>
<property name="top_attach">2</property> <property name="top_attach">1</property>
<property name="width">3</property> <property name="width">2</property>
<property name="height">1</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkLabel" id="latitude_label"> <object class="GtkLabel" id="latitude_label">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="label" translatable="yes" context="Chart edit, Latitude label">Latitude</property> <property name="label" translatable="yes">Latitude</property>
</object> </object>
<packing> <packing>
<property name="left_attach">0</property> <property name="left_attach">0</property>
<property name="top_attach">3</property> <property name="top_attach">2</property>
<property name="width">2</property> <property name="width">2</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkRadioButton" id="north_lat"> <object class="GtkRadioButton" id="north_lat">
<property name="label" translatable="yes" context="Chart edit, latitude North label">North</property> <property name="label" translatable="yes">North</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="xalign">0</property>
<property name="active">True</property> <property name="active">True</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
</object> </object>
<packing> <packing>
<property name="left_attach">0</property> <property name="left_attach">0</property>
<property name="top_attach">4</property> <property name="top_attach">3</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkRadioButton" id="south_lat"> <object class="GtkRadioButton" id="south_lat">
<property name="label" translatable="yes" context="Chart edit, latitude South">South</property> <property name="label" translatable="yes">South</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="xalign">0</property>
<property name="active">True</property> <property name="active">True</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
<property name="group">north_lat</property> <property name="group">north_lat</property>
</object> </object>
<packing> <packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>
<property name="top_attach">4</property> <property name="top_attach">3</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -489,7 +508,7 @@
</object> </object>
<packing> <packing>
<property name="left_attach">0</property> <property name="left_attach">0</property>
<property name="top_attach">5</property> <property name="top_attach">4</property>
<property name="width">2</property> <property name="width">2</property>
</packing> </packing>
</child> </child>
@ -497,43 +516,41 @@
<object class="GtkLabel" id="longitude_label"> <object class="GtkLabel" id="longitude_label">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="label" translatable="yes" context="Chart edit, Longitude label">Longitude</property> <property name="label" translatable="yes">Longitude</property>
</object> </object>
<packing> <packing>
<property name="left_attach">2</property> <property name="left_attach">2</property>
<property name="top_attach">3</property> <property name="top_attach">2</property>
<property name="width">2</property> <property name="width">2</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkRadioButton" id="east_long"> <object class="GtkRadioButton" id="east_long">
<property name="label" translatable="yes" context="Chart edit, longitude East">East</property> <property name="label" translatable="yes">East</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="xalign">0</property>
<property name="active">True</property> <property name="active">True</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
</object> </object>
<packing> <packing>
<property name="left_attach">2</property> <property name="left_attach">2</property>
<property name="top_attach">4</property> <property name="top_attach">3</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkRadioButton" id="west_long"> <object class="GtkRadioButton" id="west_long">
<property name="label" translatable="yes" context="Chart edit, longitude West">West</property> <property name="label" translatable="yes">West</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="xalign">0</property>
<property name="active">True</property> <property name="active">True</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
<property name="group">east_long</property> <property name="group">east_long</property>
</object> </object>
<packing> <packing>
<property name="left_attach">3</property> <property name="left_attach">3</property>
<property name="top_attach">4</property> <property name="top_attach">3</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -545,19 +562,47 @@
</object> </object>
<packing> <packing>
<property name="left_attach">2</property> <property name="left_attach">2</property>
<property name="top_attach">5</property> <property name="top_attach">4</property>
<property name="width">2</property> <property name="width">2</property>
</packing> </packing>
</child> </child>
</object>
</child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
<property name="width">2</property>
</packing>
</child><!-- location_frame -->
<child>
<object class="GtkFrame" id="time_frame">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child type="label">
<object class="GtkLabel" id="time_frame_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Date and time</property>
</object>
</child>
<child>
<object class="GtkGrid" id="time_grid">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="row_homogeneous">True</property>
<property name="column_homogeneous">True</property>
<child> <child>
<object class="GtkLabel" id="year_label"> <object class="GtkLabel" id="year_label">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="label" translatable="yes" context="Chart edit, Year label">Year</property> <property name="label" translatable="yes">Year</property>
</object> </object>
<packing> <packing>
<property name="left_attach">4</property> <property name="left_attach">0</property>
<property name="top_attach">1</property> <property name="top_attach">0</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -567,18 +612,18 @@
<property name="adjustment">year_adjust</property> <property name="adjustment">year_adjust</property>
</object> </object>
<packing> <packing>
<property name="left_attach">4</property> <property name="left_attach">1</property>
<property name="top_attach">2</property> <property name="top_attach">0</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkLabel" id="month_label"> <object class="GtkLabel" id="month_label">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="label" translatable="yes" context="Chart edit, Month label">Month</property> <property name="label" translatable="yes">Month</property>
</object> </object>
<packing> <packing>
<property name="left_attach">5</property> <property name="left_attach">0</property>
<property name="top_attach">1</property> <property name="top_attach">1</property>
</packing> </packing>
</child> </child>
@ -589,19 +634,19 @@
<property name="adjustment">month_adjust</property> <property name="adjustment">month_adjust</property>
</object> </object>
<packing> <packing>
<property name="left_attach">5</property> <property name="left_attach">1</property>
<property name="top_attach">2</property> <property name="top_attach">1</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkLabel" id="day_label"> <object class="GtkLabel" id="day_label">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="label" translatable="yes" context="Chart edit, Day label">Day</property> <property name="label" translatable="yes">Day</property>
</object> </object>
<packing> <packing>
<property name="left_attach">6</property> <property name="left_attach">0</property>
<property name="top_attach">1</property> <property name="top_attach">2</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -611,7 +656,7 @@
<property name="adjustment">day_adjust</property> <property name="adjustment">day_adjust</property>
</object> </object>
<packing> <packing>
<property name="left_attach">6</property> <property name="left_attach">1</property>
<property name="top_attach">2</property> <property name="top_attach">2</property>
</packing> </packing>
</child> </child>
@ -619,11 +664,11 @@
<object class="GtkLabel" id="hour_label"> <object class="GtkLabel" id="hour_label">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="label" translatable="yes" context="Chart edit, Hour label">Hour</property> <property name="label" translatable="yes">Hour</property>
</object> </object>
<packing> <packing>
<property name="left_attach">4</property> <property name="left_attach">2</property>
<property name="top_attach">3</property> <property name="top_attach">0</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -633,19 +678,19 @@
<property name="adjustment">hour_adjust</property> <property name="adjustment">hour_adjust</property>
</object> </object>
<packing> <packing>
<property name="left_attach">4</property> <property name="left_attach">3</property>
<property name="top_attach">4</property> <property name="top_attach">0</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkLabel" id="minute_label"> <object class="GtkLabel" id="minute_label">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="label" translatable="yes" context="Chart edit, Minute label">Minute</property> <property name="label" translatable="yes">Minute</property>
</object> </object>
<packing> <packing>
<property name="left_attach">5</property> <property name="left_attach">2</property>
<property name="top_attach">3</property> <property name="top_attach">1</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -655,19 +700,19 @@
<property name="adjustment">minute_adjust</property> <property name="adjustment">minute_adjust</property>
</object> </object>
<packing> <packing>
<property name="left_attach">5</property> <property name="left_attach">3</property>
<property name="top_attach">4</property> <property name="top_attach">1</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkLabel" id="second_label"> <object class="GtkLabel" id="second_label">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="label" translatable="yes" context="Chart edit, Second label">Second</property> <property name="label" translatable="yes">Second</property>
</object> </object>
<packing> <packing>
<property name="left_attach">6</property> <property name="left_attach">2</property>
<property name="top_attach">3</property> <property name="top_attach">2</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -677,18 +722,18 @@
<property name="adjustment">second_adjust</property> <property name="adjustment">second_adjust</property>
</object> </object>
<packing> <packing>
<property name="left_attach">6</property> <property name="left_attach">3</property>
<property name="top_attach">4</property> <property name="top_attach">2</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkLabel" id="timezone_label"> <object class="GtkLabel" id="timezone_label">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="label" translatable="yes" context="Chart edit, Timezone label">Timezone</property> <property name="label" translatable="yes">Timezone</property>
</object> </object>
<packing> <packing>
<property name="left_attach">7</property> <property name="left_attach">2</property>
<property name="top_attach">3</property> <property name="top_attach">3</property>
</packing> </packing>
</child> </child>
@ -700,53 +745,37 @@
<property name="digits">1</property> <property name="digits">1</property>
</object> </object>
<packing> <packing>
<property name="left_attach">7</property> <property name="left_attach">3</property>
<property name="top_attach">4</property> <property name="top_attach">3</property>
</packing> </packing>
</child> </child>
<child> </object>
<object class="GtkLabel" id="house_system_label"> </child><!-- time_grid -->
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes" context="Chart edit, House system label">House system</property>
</object> </object>
<packing> <packing>
<property name="left_attach">4</property> <property name="left_attach">2</property>
<property name="top_attach">5</property> <property name="top_attach">1</property>
</packing> </packing>
</child> </child><!-- time_frame -->
<child> <child>
<object class="GtkComboBox" id="house_system"> <object class="GtkFrame" id="notes_frame">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="model">house_system_model</property> <property name="label_xalign">0</property>
<property name="id_column">1</property> <property name="shadow_type">none</property>
</object> <child type="label">
<packing> <object class="GtkLabel" id="notes_frame_label">
<property name="left_attach">5</property>
<property name="top_attach">5</property>
<property name="width">2</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="note_label">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="xalign">0</property> <property name="label" translatable="yes">Notes</property>
<property name="label" translatable="yes" context="Chart edit, Note label">Note</property>
</object> </object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">6</property>
<property name="width">7</property>
</packing>
</child> </child>
<child> <child>
<object class="GtkScrolledWindow" id="note_scroll"> <object class="GtkScrolledWindow" id="notes_scroll">
<property name="height_request">300</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">False</property>
<property name="shadow_type">in</property> <property name="shadow_type">in</property>
<property name="min_content_height">300</property>
<child> <child>
<object class="GtkTextView" id="note"> <object class="GtkTextView" id="note">
<property name="visible">True</property> <property name="visible">True</property>
@ -755,12 +784,14 @@
</object> </object>
</child> </child>
</object> </object>
</child>
</object>
<packing> <packing>
<property name="left_attach">0</property> <property name="left_attach">0</property>
<property name="top_attach">7</property> <property name="top_attach">2</property>
<property name="width">7</property> <property name="width">3</property>
</packing> </packing>
</child> </child><!-- notes_frame -->
</object> </object>
<packing> <packing>
<property name="name">edit</property> <property name="name">edit</property>
@ -797,6 +828,17 @@
<property name="action_target">'antiscia'</property> <property name="action_target">'antiscia'</property>
</object> </object>
</child> </child>
<child>
<object class="GtkComboBox" id="house_system">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="model">house_system_model</property>
<property name="id_column">1</property>
</object>
<packing>
<property name="pack_type">start</property>
</packing>
</child>
<child> <child>
<object class="GtkComboBox" id="display_theme"> <object class="GtkComboBox" id="display_theme">
<property name="visible">True</property> <property name="visible">True</property>