From 1f66b31416a649165b4f44a82e3050da91b2897c Mon Sep 17 00:00:00 2001 From: Leo Franchi Date: Sat, 19 Mar 2011 20:34:04 -0400 Subject: [PATCH] shrink the twitter config dialog a bit. The text didn't fit by default in on OS X. Removed the groupbox as it made huge margins and cut off text. Removed some text, and reworked some of the contents of a qlabel into another qlabel because multiline qlabels fail at layouting --- src/sip/twitter/twitterconfigwidget.cpp | 16 ++- src/sip/twitter/twitterconfigwidget.ui | 183 ++++++++++++------------ 2 files changed, 101 insertions(+), 98 deletions(-) diff --git a/src/sip/twitter/twitterconfigwidget.cpp b/src/sip/twitter/twitterconfigwidget.cpp index 3981ce1b8..70c16a512 100644 --- a/src/sip/twitter/twitterconfigwidget.cpp +++ b/src/sip/twitter/twitterconfigwidget.cpp @@ -47,13 +47,15 @@ TwitterConfigWidget::TwitterConfigWidget(SipPlugin* plugin, QWidget *parent) : { ui->twitterStatusLabel->setText("Status: No saved credentials"); ui->twitterAuthenticateButton->setText( "Authenticate" ); - ui->twitterInstructionsBox->setVisible( false ); + ui->twitterInstructionsInfoLabel->setVisible( false ); + ui->twitterTweetGotTomahawkButton->setVisible( false ); } else { ui->twitterStatusLabel->setText("Status: Credentials saved"); ui->twitterAuthenticateButton->setText( "Re-authenticate" ); - ui->twitterInstructionsBox->setVisible( true ); + ui->twitterInstructionsInfoLabel->setVisible( true ); + ui->twitterTweetGotTomahawkButton->setVisible( true ); } } @@ -77,7 +79,10 @@ TwitterConfigWidget::authenticateTwitter() s->setTwitterOAuthTokenSecret( twitAuth->oauthTokenSecret() ); ui->twitterStatusLabel->setText("Status: Credentials saved"); ui->twitterAuthenticateButton->setText( "Re-authenticate" ); - ui->twitterInstructionsBox->setVisible( true ); + + ui->twitterInstructionsInfoLabel->setVisible( true ); + ui->twitterTweetGotTomahawkButton->setVisible( true ); + TomahawkSettings::instance()->setTwitterCachedFriendsSinceId( 0 ); TomahawkSettings::instance()->setTwitterCachedMentionsSinceId( 0 ); m_plugin->connectPlugin( false ); @@ -90,7 +95,10 @@ TwitterConfigWidget::authenticateTwitter() s->setTwitterOAuthTokenSecret( QString() ); ui->twitterStatusLabel->setText("Status: No saved credentials"); ui->twitterAuthenticateButton->setText( "Authenticate" ); - ui->twitterInstructionsBox->setVisible( false ); + + ui->twitterInstructionsInfoLabel->setVisible( false ); + ui->twitterTweetGotTomahawkButton->setVisible( false ); + QMessageBox::critical( 0, QString("Tweetin' Error"), QString("There was an error validating your authentication") ); } } diff --git a/src/sip/twitter/twitterconfigwidget.ui b/src/sip/twitter/twitterconfigwidget.ui index ad35c9d55..f7109915a 100644 --- a/src/sip/twitter/twitterconfigwidget.ui +++ b/src/sip/twitter/twitterconfigwidget.ui @@ -1,106 +1,101 @@ + - - - TwitterConfigWidget - - Twitter - - + + + 0 + 0 + 795 + 509 + + + + + + + + + + 0 + 0 + + + + Authenticating with Twitter allows you to discover and play music from your Twitter friends running Tomahawk. + + + true + + + + + + + This feature works best when you have set a static host name in the "Network" settings tab under Advanced Settings, but may work even if you do not. Tomahawk uses Direct Messages and this will only work when both Twitter users have followed each other. + + + true + + + + + - - - - - - 0 - 0 - - - - Authenticating with Twitter allows you to discover and play music from your Twitter friends running Tomahawk. - -This feature works best when you have set a static host name in the "Network" settings tab under Advanced Settings, but may work even if you do not. Please note: this discovery uses Direct Messages and will only work when both Twitter users have followed each other. Tomahawk will attempt to "clean up" after itself to keep your Direct Message inbox tidy, but may miss some. - -When you press the button your web browser will launch and take you to Twitter.com to authenticate. You must copy and paste the PIN number into the dialog box that appears. - - - true - - - - - - - - - Status: No saved credentials - - - Qt::AutoText - - - - - - - Authenticate with Twitter - - - - - - - - - - - Instructions + + + Status: No saved credentials + + + Qt::AutoText - - - - - - - How it works is simple: just press the button below to tweet "Got Tomahawk?" and some necessary information. Then be (very) patient. Twitter is an asynchronous protocol so it can take a bit! - -If connections to peers seem to have been lost, just press the button again to re-post a tweet for resynchronization. - - - - true - - - - - - - Press here to have Tomahawk post a tweet - - - - - - - - - Qt::Vertical + + + Authenticate with Twitter - - - 20 - 40 - - - + - - + + + + + + + Here's how it works: just press the button below to tweet "Got Tomahawk?" and some necessary information. Then be (very) patient. Twitter is an asynchronous protocol so it can take a bit! + +If connections to peers seem to have been lost, just press the button again to re-post a tweet for resynchronization. + + + true + + + + + + + Press here to have Tomahawk post a tweet + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + - \ No newline at end of file +