Changeset 5312


Ignore:
Timestamp:
Mar 19, 2008, 7:30:03 PM (14 years ago)
Author:
charles
Message:

(gtk) minor HIG: use "Toolbar" and "Statusbar" instead of "Tool Bar" and "Status Bar"

Location:
trunk/gtk
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/gtk/actions.c

    r5307 r5312  
    8585  { "sort-reversed", NULL,
    8686    N_("_Reverse Sort Order"), NULL, NULL, G_CALLBACK(toggle_pref_cb), FALSE },
    87   { "show-filter-bar", NULL,
    88     N_("_Filter Bar"), NULL, NULL, G_CALLBACK(toggle_pref_cb), FALSE },
    89   { "show-status-bar", NULL,
    90     N_("_Status Bar"), NULL, NULL, G_CALLBACK(toggle_pref_cb), FALSE },
     87  { "show-filterbar", NULL,
     88    N_("_Filterbar"), NULL, NULL, G_CALLBACK(toggle_pref_cb), FALSE },
     89  { "show-statusbar", NULL,
     90    N_("_Statusbar"), NULL, NULL, G_CALLBACK(toggle_pref_cb), FALSE },
    9191  { "show-toolbar", NULL,
    9292    N_("_Toolbar"), NULL, NULL, G_CALLBACK(toggle_pref_cb), FALSE }
  • trunk/gtk/msgwin.c

    r5305 r5312  
    392392    win = gtk_window_new( GTK_WINDOW_TOPLEVEL );
    393393    gtk_window_set_title( GTK_WINDOW( win ), _( "Message Log" ) );
    394     gtk_window_set_default_size( GTK_WINDOW( win ), 600, 400 );
     394    gtk_window_set_default_size( GTK_WINDOW( win ), 560, 350 );
    395395    gtk_window_set_role( GTK_WINDOW( win ), "message-log" );
    396396    vbox = gtk_vbox_new( FALSE, 0 );
  • trunk/gtk/tr-icon.c

    r5226 r5312  
    1 /******************************************************************************
     1/*
     2 * This file Copyright (C) 2007-2008 Charles Kerr <charles@rebelbase.com>
     3 *
     4 * This file is licensed by the GPL version 2.  Works owned by the
     5 * Transmission project are granted a special exemption to clause 2(b)
     6 * so that the bulk of its code can remain under the MIT license.
     7 * This exemption does not extend to derived works not owned by
     8 * the Transmission project.
     9 *
    210 * $Id$
    3  *
    4  * Copyright (c) 2006-2008 Transmission authors and contributors
    5  *
    6  * Permission is hereby granted, free of charge, to any person obtaining a
    7  * copy of this software and associated documentation files (the "Software"),
    8  * to deal in the Software without restriction, including without limitation
    9  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
    10  * and/or sell copies of the Software, and to permit persons to whom the
    11  * Software is furnished to do so, subject to the following conditions:
    12  *
    13  * The above copyright notice and this permission notice shall be included in
    14  * all copies or substantial portions of the Software.
    15  *
    16  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
    17  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
    18  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
    19  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
    20  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
    21  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
    22  * DEALINGS IN THE SOFTWARE.
    23  *****************************************************************************/
     11 */
    2412
    2513#include <glib/gi18n.h>
  • trunk/gtk/tr-prefs.c

    r5307 r5312  
    4747
    4848    pref_flag_set_default   ( PREF_KEY_TOOLBAR, TRUE );
    49     pref_flag_set_default   ( PREF_KEY_FILTER_BAR, TRUE );
    50     pref_flag_set_default   ( PREF_KEY_STATUS_BAR, TRUE );
    51     pref_string_set_default ( PREF_KEY_STATUS_BAR_STATS, "total-ratio" );
     49    pref_flag_set_default   ( PREF_KEY_FILTERBAR, TRUE );
     50    pref_flag_set_default   ( PREF_KEY_STATUSBAR, TRUE );
     51    pref_string_set_default ( PREF_KEY_STATUSBAR_STATS, "total-ratio" );
    5252
    5353    pref_flag_set_default   ( PREF_KEY_DL_LIMIT_ENABLED, FALSE );
  • trunk/gtk/tr-prefs.h

    r5295 r5312  
    4242#define PREF_KEY_SORT_REVERSED          "sort-reversed"
    4343#define PREF_KEY_MINIMAL_VIEW           "minimal-view"
    44 #define PREF_KEY_FILTER_BAR             "show-filter-bar"
    45 #define PREF_KEY_STATUS_BAR             "show-status-bar"
    46 #define PREF_KEY_STATUS_BAR_STATS       "status-bar-stats"
     44#define PREF_KEY_FILTERBAR              "show-filterbar"
     45#define PREF_KEY_STATUSBAR              "show-statusbar"
     46#define PREF_KEY_STATUSBAR_STATS        "statusbar-stats"
    4747#define PREF_KEY_TOOLBAR                "show-toolbar"
    4848#define PREF_KEY_MAX_PEERS_GLOBAL       "max-peers-global"
  • trunk/gtk/tr-window.c

    r5228 r5312  
    201201       gtk_widget_queue_draw( p->view );
    202202    }
    203     else if( !strcmp( key, PREF_KEY_STATUS_BAR ) )
     203    else if( !strcmp( key, PREF_KEY_STATUSBAR ) )
    204204    {
    205205        const gboolean isEnabled = pref_flag_get( key );
    206206        g_object_set( p->status, "visible", isEnabled, NULL );
    207207    }
    208     else if( !strcmp( key, PREF_KEY_FILTER_BAR ) )
     208    else if( !strcmp( key, PREF_KEY_FILTERBAR ) )
    209209    {
    210210        const gboolean isEnabled = pref_flag_get( key );
     
    216216        g_object_set( p->toolbar, "visible", isEnabled, NULL );
    217217    }
    218     else if( !strcmp( key, PREF_KEY_STATUS_BAR_STATS ) )
     218    else if( !strcmp( key, PREF_KEY_STATUSBAR_STATS ) )
    219219    {
    220220        tr_window_update( (TrWindow*)wind );
     
    257257        PrivateData * p = vprivate;
    258258        const char * val = g_object_get_data( G_OBJECT( menu_item ), STATS_MODE );
    259         tr_core_set_pref( p->core, PREF_KEY_STATUS_BAR_STATS, val );
     259        tr_core_set_pref( p->core, PREF_KEY_STATUSBAR_STATS, val );
    260260    }
    261261}
     
    506506    status_stats_mode = 0;
    507507    l = NULL;
    508     pch = pref_string_get( PREF_KEY_STATUS_BAR_STATS );
     508    pch = pref_string_get( PREF_KEY_STATUSBAR_STATS );
    509509    for( i=0, n=G_N_ELEMENTS(stats_modes); i<n; ++i )
    510510    {
     
    576576    p->core = core;
    577577    prefsChanged( core, PREF_KEY_MINIMAL_VIEW, self );
    578     prefsChanged( core, PREF_KEY_FILTER_BAR, self );
    579     prefsChanged( core, PREF_KEY_STATUS_BAR, self );
    580     prefsChanged( core, PREF_KEY_STATUS_BAR_STATS, self );
     578    prefsChanged( core, PREF_KEY_FILTERBAR, self );
     579    prefsChanged( core, PREF_KEY_STATUSBAR, self );
     580    prefsChanged( core, PREF_KEY_STATUSBAR_STATS, self );
    581581    prefsChanged( core, PREF_KEY_TOOLBAR, self );
    582582    p->pref_handler_id = g_signal_connect( core, "prefs-changed",
     
    619619
    620620    /* update the stats */
    621     pch = pref_string_get( PREF_KEY_STATUS_BAR_STATS );
     621    pch = pref_string_get( PREF_KEY_STATUSBAR_STATS );
    622622    if( !strcmp( pch, "session-ratio" ) ) {
    623623        tr_getSessionStats( handle, &stats );
  • trunk/gtk/ui.h

    r5216 r5312  
    2727"      <separator/>\n"
    2828"      <menuitem action='show-toolbar'/>\n"
    29 "      <menuitem action='show-filter-bar'/>\n"
    30 "      <menuitem action='show-status-bar'/>\n"
     29"      <menuitem action='show-filterbar'/>\n"
     30"      <menuitem action='show-statusbar'/>\n"
    3131"      <separator/>\n"
    3232"      <menuitem action='sort-by-activity'/>\n"
Note: See TracChangeset for help on using the changeset viewer.