Photos

Merge lp:~mathias-porten/pantheon-photos/fix-1467148 into lp:~pantheon-photos/pantheon-photos/trunk

  1. fix-1467148
  2. Merge into trunk
Proposed by mporten
Status: Rejected
Rejected by: Danielle Foré
Proposed branch: lp:~mathias-porten/pantheon-photos/fix-1467148
Merge into: lp:~pantheon-photos/pantheon-photos/trunk
Diff against target: 201 lines (+63/-95)
1 file modified
ui/shotwell.glade (+63/-95)
To merge this branch: bzr merge lp:~mathias-porten/pantheon-photos/fix-1467148
Reviewer Review Type Date Requested Status
Danielle Foré Disapprove
Review via email: mp+268304@code.launchpad.net

Description of the change

Changed section headers in Preferences dialog from bold to <h4>

To post a comment you must log in.
Revision history for this message
Danielle Foré (danrabbit) wrote :

The code you edited seems to be vestigial. Removed it and pushed a branch that edits the right section here: https://code.launchpad.net/~elementary-apps/pantheon-photos/h4-headers

review: Disapprove

Unmerged revisions

2808. By mporten

changed bold sections to <h4>

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'ui/shotwell.glade'
--- ui/shotwell.glade 2014-11-08 13:37:25 +0000
+++ ui/shotwell.glade 2015-08-18 09:20:23 +0000
@@ -578,28 +578,6 @@
578 </packing>578 </packing>
579 </child>579 </child>
580 <child>580 <child>
581 <object class="GtkAlignment" id="alignment4">
582 <property name="visible">True</property>
583 <property name="can_focus">False</property>
584 <property name="top_padding">3</property>
585 <property name="bottom_padding">3</property>
586 <child>
587 <object class="GtkLabel" id="library location">
588 <property name="visible">True</property>
589 <property name="can_focus">False</property>
590 <property name="xalign">0</property>
591 <property name="label" translatable="yes">Library Location</property>
592 <attributes>
593 <attribute name="weight" value="bold"/>
594 </attributes>
595 </object>
596 </child>
597 </object>
598 <packing>
599 <property name="right_attach">2</property>
600 </packing>
601 </child>
602 <child>
603 <object class="GtkAlignment" id="alignment8">581 <object class="GtkAlignment" id="alignment8">
604 <property name="visible">True</property>582 <property name="visible">True</property>
605 <property name="can_focus">False</property>583 <property name="can_focus">False</property>
@@ -626,30 +604,6 @@
626 </packing>604 </packing>
627 </child>605 </child>
628 <child>606 <child>
629 <object class="GtkAlignment" id="label: metadata">
630 <property name="visible">True</property>
631 <property name="can_focus">False</property>
632 <property name="top_padding">14</property>
633 <property name="bottom_padding">3</property>
634 <child>
635 <object class="GtkLabel" id="label10">
636 <property name="visible">True</property>
637 <property name="can_focus">False</property>
638 <property name="xalign">0</property>
639 <property name="label" translatable="yes">Metadata</property>
640 <attributes>
641 <attribute name="weight" value="bold"/>
642 </attributes>
643 </object>
644 </child>
645 </object>
646 <packing>
647 <property name="right_attach">2</property>
648 <property name="top_attach">8</property>
649 <property name="bottom_attach">9</property>
650 </packing>
651 </child>
652 <child>
653 <object class="GtkAlignment" id="label: metadate write">607 <object class="GtkAlignment" id="label: metadate write">
654 <property name="visible">True</property>608 <property name="visible">True</property>
655 <property name="can_focus">False</property>609 <property name="can_focus">False</property>
@@ -698,30 +652,6 @@
698 </packing>652 </packing>
699 </child>653 </child>
700 <child>654 <child>
701 <object class="GtkAlignment" id="label: importing">
702 <property name="visible">True</property>
703 <property name="can_focus">False</property>
704 <property name="top_padding">14</property>
705 <property name="bottom_padding">3</property>
706 <child>
707 <object class="GtkLabel" id="importing">
708 <property name="visible">True</property>
709 <property name="can_focus">False</property>
710 <property name="xalign">0</property>
711 <property name="label" translatable="yes">Importing</property>
712 <attributes>
713 <attribute name="weight" value="bold"/>
714 </attributes>
715 </object>
716 </child>
717 </object>
718 <packing>
719 <property name="right_attach">2</property>
720 <property name="top_attach">3</property>
721 <property name="bottom_attach">4</property>
722 </packing>
723 </child>
724 <child>
725 <object class="GtkAlignment" id="label: directory structure">655 <object class="GtkAlignment" id="label: directory structure">
726 <property name="visible">True</property>656 <property name="visible">True</property>
727 <property name="can_focus">False</property>657 <property name="can_focus">False</property>
@@ -891,30 +821,6 @@
891 </packing>821 </packing>
892 </child>822 </child>
893 <child>823 <child>
894 <object class="GtkAlignment" id="label: developer">
895 <property name="visible">True</property>
896 <property name="can_focus">False</property>
897 <property name="top_padding">14</property>
898 <property name="bottom_padding">3</property>
899 <child>
900 <object class="GtkLabel" id="label3">
901 <property name="visible">True</property>
902 <property name="can_focus">False</property>
903 <property name="xalign">0</property>
904 <property name="label" translatable="yes">RAW Developer</property>
905 <attributes>
906 <attribute name="weight" value="bold"/>
907 </attributes>
908 </object>
909 </child>
910 </object>
911 <packing>
912 <property name="right_attach">2</property>
913 <property name="top_attach">10</property>
914 <property name="bottom_attach">11</property>
915 </packing>
916 </child>
917 <child>
918 <object class="GtkComboBoxText" id="default_raw_developer2">824 <object class="GtkComboBoxText" id="default_raw_developer2">
919 <property name="visible">True</property>825 <property name="visible">True</property>
920 <property name="can_focus">False</property>826 <property name="can_focus">False</property>
@@ -948,6 +854,68 @@
948 <property name="bottom_attach">12</property>854 <property name="bottom_attach">12</property>
949 </packing>855 </packing>
950 </child>856 </child>
857 <child>
858 <object class="GtkLabel" id="library location">
859 <property name="visible">True</property>
860 <property name="can_focus">False</property>
861 <property name="xalign">0</property>
862 <property name="label" translatable="yes">Library Location</property>
863 <style>
864 <class name="h4"/>
865 </style>
866 </object>
867 <packing>
868 <property name="right_attach">2</property>
869 </packing>
870 </child>
871 <child>
872 <object class="GtkLabel" id="importing">
873 <property name="visible">True</property>
874 <property name="can_focus">False</property>
875 <property name="xalign">0</property>
876 <property name="label" translatable="yes">Importing</property>
877 <style>
878 <class name="h4"/>
879 </style>
880 </object>
881 <packing>
882 <property name="right_attach">2</property>
883 <property name="top_attach">3</property>
884 <property name="bottom_attach">4</property>
885 </packing>
886 </child>
887 <child>
888 <object class="GtkLabel" id="label10">
889 <property name="visible">True</property>
890 <property name="can_focus">False</property>
891 <property name="xalign">0</property>
892 <property name="label" translatable="yes">Metadata</property>
893 <style>
894 <class name="h4"/>
895 </style>
896 </object>
897 <packing>
898 <property name="right_attach">2</property>
899 <property name="top_attach">8</property>
900 <property name="bottom_attach">9</property>
901 </packing>
902 </child>
903 <child>
904 <object class="GtkLabel" id="label3">
905 <property name="visible">True</property>
906 <property name="can_focus">False</property>
907 <property name="xalign">0</property>
908 <property name="label" translatable="yes">RAW Developer</property>
909 <style>
910 <class name="h4"/>
911 </style>
912 </object>
913 <packing>
914 <property name="right_attach">2</property>
915 <property name="top_attach">10</property>
916 <property name="bottom_attach">11</property>
917 </packing>
918 </child>
951 </object>919 </object>
952 </child>920 </child>
953 </object>921 </object>
@@ -1934,4 +1902,4 @@
1934 </packing>1902 </packing>
1935 </child>1903 </child>
1936 </object>1904 </object>
1937</interface>
1938\ No newline at end of file1905\ No newline at end of file
1906</interface>

Subscribers

People subscribed via source and target branches

to all changes: