Changeset 8262

Timestamp:

Apr 21, 2009, 1:00:17 AM (14 years ago)

Author:

charles

Message:

(trunk gtk, qt) sync some keyboard mnemonics and the about dialogs

Location:

trunk

Files:

• gtk/details.c (modified) (2 diffs)
• qt/about.cc (modified) (2 diffs)
• qt/about.h (modified) (2 diffs)
• qt/about.ui (deleted)
• qt/mainwin.cc (modified) (1 diff)
• qt/prefs-dialog.cc (modified) (1 diff)
• qt/qtr.pro (modified) (1 diff)

trunk/gtk/details.c

@@ -489 +489 @@
                       G_CALLBACK( onPeerViewQueryTooltip ), NULL );
 #endif
-    gtk_widget_set_size_request( v, 550, 0 );
     g_object_unref( G_OBJECT( m ) );
     g_signal_connect( v, "button-release-event",
@@ -1053 +1052 @@
     row = 0;
     t = hig_workarea_create( );
-    hig_workarea_add_section_title( t, &row, _( "Speed Limits" ) );
+    hig_workarea_add_section_title( t, &row, _( "Speed" ) );
 
         b = tr_torrentUsesSessionLimits( tor );

trunk/qt/about.cc

@@ -11 +11 @@
  */
 
-#include <QAbstractButton>
-#include <QMovie>
+#include <QDialogButtonBox>
+#include <QFont>
+#include <QLabel>
+#include <QPixmap>
+#include <QVBoxLayout>
+#include <QWidget>
 
 #include <libtransmission/transmission.h>
@@ -19 +23 @@
 #include "about.h"
 
-namespace
-{
-    QMovie * movie;
-}
-
 AboutDialog :: AboutDialog( QWidget * parent ):
     QDialog( parent, Qt::Dialog )
 {
-    ui.setupUi( this );
+    QLabel * l;
+    QVBoxLayout * v = new QVBoxLayout( this );
+    setWindowTitle( tr( "About Transmission" ) );
 
-    ui.label->setText( "Transmission " LONG_VERSION_STRING );
-    connect( ui.buttonBox, SIGNAL(clicked(QAbstractButton*)), this, SLOT(hide()));
-    movie = new QMovie( ":/icons/dance.gif" );
-    connect( movie, SIGNAL(frameChanged(int)), this, SLOT(onFrameChanged()));
-    movie->start( );
+    l = new QLabel;
+    l->setPixmap( QPixmap( ":/icons/transmission-48.png" ) );
+    l->setAlignment( Qt::AlignCenter );
+    v->addWidget( l );
+
+    QFont f( font( ) );
+    f.setWeight( QFont::Bold );
+    f.setPointSize( int( f.pointSize( ) * 1.2 ) );
+    l = new QLabel( "<big>Transmission " LONG_VERSION_STRING "</big>" );
+    l->setAlignment( Qt::AlignCenter );
+    l->setFont( f );
+    l->setMargin( 8 );
+    v->addWidget( l );
+
+    l = new QLabel( tr( "A fast and easy BitTorrent client" ) );
+    l->setStyleSheet( "text-align: center" );
+    l->setAlignment( Qt::AlignCenter );
+    v->addWidget( l );
+
+    l = new QLabel( tr( "Copyright 2005-2009, the Transmission project" ) );
+    l->setAlignment( Qt::AlignCenter );
+    v->addWidget( l );
+
+    l = new QLabel( "<a href=\"http://www.transmissionbt.com/\">http://www.transmissionbt.com/</a>" );
+    l->setOpenExternalLinks( true );
+    l->setAlignment( Qt::AlignCenter );
+    v->addWidget( l );
+
+    v->addSpacing( 10 );
+
+    QDialogButtonBox * box = new QDialogButtonBox;
+    box->addButton( QDialogButtonBox::Close );
+    box->setCenterButtons( true );
+    v->addWidget( box );
+    connect( box, SIGNAL(rejected()), this, SLOT(hide()) );
 }
-
-AboutDialog :: ~AboutDialog( )
-{
-}
-
-void
-AboutDialog :: onFrameChanged( )
-{
-    ui.aboutLogo->setPixmap( movie->currentPixmap( ) );
-}

trunk/qt/about.h

@@ -14 +14 @@
 #define ABOUT_DIALOG_H
 
-class QAbstractButton;
-class QIcon;
 #include <QDialog>
-
-#include "ui_about.h"
 
 class AboutDialog: public QDialog
@@ -24 +20 @@
         Q_OBJECT
 
-    private:
-        Ui_AboutDialog ui;
-
-    private slots: 
-        void onFrameChanged( );
-
     public:
         AboutDialog( QWidget * parent = 0 );
-        ~AboutDialog( );
+        ~AboutDialog( ) { }
 
 };

trunk/qt/mainwin.cc

@@ -17 +17 @@
 #include <QDesktopServices>
 #include <QFileDialog>
+#include <QLabel>
 #include <QSize>
 #include <QStyle>

trunk/qt/prefs-dialog.cc

@@ -471 +471 @@
     hig->addSectionDivider( );
     hig->addSectionTitle( tr( "Privacy" ) );
-    hig->addRow( tr( "Encryption &mode:" ), box );
+    hig->addRow( tr( "&Encryption mode:" ), box );
     hig->addWideControl( checkBoxNew( tr( "Use peer e&xchange" ), Prefs::PEX_ENABLED ) );
 

trunk/qt/qtr.pro

@@ -21 +21 @@
 TRANSLATIONS += transmission_en.ts
 
-FORMS += mainwin.ui about.ui
+FORMS += mainwin.ui
 RESOURCES += application.qrc
 SOURCES += about.cc app.cc details.cc file-tree.cc filters.cc hig.cc \