Changeset 8778


Ignore:
Timestamp:
Jul 3, 2009, 8:10:05 PM (13 years ago)
Author:
charles
Message:

(trunk gtk,qt) #2264: Duplicate keyboard accelerators in the GTK+ client's "View" menu

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/gtk/actions.c

    r8729 r8778  
    4747static GtkRadioActionEntry sort_radio_entries[] =
    4848{
    49     { "sort-by-activity", NULL, N_( "Sort by _Activity" ), NULL, NULL, 0 },
    50     { "sort-by-name",     NULL, N_( "Sort by _Name" ),     NULL, NULL, 1 },
    51     { "sort-by-progress", NULL, N_( "Sort by _Progress" ), NULL, NULL, 2 },
    52     { "sort-by-ratio",    NULL, N_( "Sort by _Ratio" ),    NULL, NULL, 3 },
    53     { "sort-by-state",    NULL, N_( "Sort by _State" ),    NULL, NULL, 4 },
    54     { "sort-by-tracker",  NULL, N_( "Sort by _Tracker" ),  NULL, NULL, 5 },
    55     { "sort-by-age",      NULL, N_( "Sort by A_ge" ),      NULL, NULL, 6 },
    56     { "sort-by-eta",      NULL, N_( "Sort by _ETA" ),      NULL, NULL, 7 },
    57     { "sort-by-size",     NULL, N_( "Sort by Si_ze" ),     NULL, NULL, 8 }
     49    { "sort-by-activity",  NULL, N_( "Sort by _Activity" ), NULL, NULL, 0 },
     50    { "sort-by-name",      NULL, N_( "Sort by _Name" ),      NULL, NULL, 1 },
     51    { "sort-by-progress",  NULL, N_( "Sort by _Progress" ), NULL, NULL, 2 },
     52    { "sort-by-ratio",     NULL, N_( "Sort by Rati_o" ),     NULL, NULL, 3 },
     53    { "sort-by-state",     NULL, N_( "Sort by Stat_e" ),     NULL, NULL, 4 },
     54    { "sort-by-tracker",   NULL, N_( "Sort by T_racker" ),   NULL, NULL, 5 },
     55    { "sort-by-age",       NULL, N_( "Sort by A_ge" ),       NULL, NULL, 6 },
     56    { "sort-by-time-left", NULL, N_( "Sort by Time _Left" ), NULL, NULL, 7 },
     57    { "sort-by-size",      NULL, N_( "Sort by Si_ze" ),      NULL, NULL, 8 }
    5858};
    5959
     
    9090    { "alt-speed-enabled", NULL, N_( "Temporary  Speed _Limits" ), NULL, NULL, G_CALLBACK( toggle_pref_cb ), FALSE },
    9191    { "minimal-view",      NULL, N_( "_Minimal View" ), "<alt>M", NULL, G_CALLBACK( toggle_pref_cb ), FALSE },
    92     { "sort-reversed",     NULL, N_( "_Reverse Sort Order" ), NULL, NULL, G_CALLBACK( toggle_pref_cb ), FALSE },
     92    { "sort-reversed",     NULL, N_( "Re_verse Sort Order" ), NULL, NULL, G_CALLBACK( toggle_pref_cb ), FALSE },
    9393    { "show-filterbar",    NULL, N_( "_Filterbar" ), NULL, NULL, G_CALLBACK( toggle_pref_cb ), FALSE },
    9494    { "show-statusbar",    NULL, N_( "_Statusbar" ), NULL, NULL, G_CALLBACK( toggle_pref_cb ), FALSE },
  • trunk/gtk/ui.h

    r8420 r8778  
    3737    "      <menuitem action='sort-by-activity'/>\n"
    3838    "      <menuitem action='sort-by-age'/>\n"
    39     "      <menuitem action='sort-by-eta'/>\n"
    4039    "      <menuitem action='sort-by-name'/>\n"
    4140    "      <menuitem action='sort-by-progress'/>\n"
     
    4342    "      <menuitem action='sort-by-size'/>\n"
    4443    "      <menuitem action='sort-by-state'/>\n"
     44    "      <menuitem action='sort-by-time-left'/>\n"
    4545    "      <menuitem action='sort-by-tracker'/>\n"
    4646    "      <separator/>\n"
  • trunk/qt/mainwin.ui

    r8397 r8778  
    119119    <addaction name="action_SortByActivity"/>
    120120    <addaction name="action_SortByAge"/>
    121     <addaction name="action_SortByETA"/>
    122121    <addaction name="action_SortByName"/>
    123122    <addaction name="action_SortByProgress"/>
     
    125124    <addaction name="action_SortBySize"/>
    126125    <addaction name="action_SortByState"/>
     126    <addaction name="action_SortByETA"/>
    127127    <addaction name="action_SortByTracker"/>
    128128    <addaction name="separator"/>
     
    368368   </property>
    369369   <property name="text">
    370     <string>Sort by &amp;ETA</string>
     370    <string>Sort by Time &amp;Left</string>
    371371   </property>
    372372  </action>
     
    392392   </property>
    393393   <property name="text">
    394     <string>Sort by &amp;Ratio</string>
     394    <string>Sort by Rati&amp;o</string>
    395395   </property>
    396396  </action>
     
    408408   </property>
    409409   <property name="text">
    410     <string>Sort by &amp;State</string>
     410    <string>Sort by Stat&amp;e</string>
    411411   </property>
    412412  </action>
     
    416416   </property>
    417417   <property name="text">
    418     <string>Sort by &amp;Tracker</string>
     418    <string>Sort by T&amp;racker</string>
    419419   </property>
    420420  </action>
     
    450450   </property>
    451451   <property name="text">
    452     <string>&amp;Reverse Sort Order</string>
     452    <string>Re&amp;verse Sort Order</string>
    453453   </property>
    454454  </action>
Note: See TracChangeset for help on using the changeset viewer.