diff --git a/src/sip/twitter/twitterconfigwidget.cpp b/src/sip/twitter/twitterconfigwidget.cpp
index ddf5e89df..027cf3726 100644
--- a/src/sip/twitter/twitterconfigwidget.cpp
+++ b/src/sip/twitter/twitterconfigwidget.cpp
@@ -46,18 +46,13 @@ TwitterConfigWidget::TwitterConfigWidget( TwitterPlugin* plugin, QWidget *parent
this, SLOT( tweetComboBoxIndexChanged( int ) ) );
ui->twitterTweetComboBox->setCurrentIndex( 0 );
- ui->twitterUserTweetLineEdit->setReadOnly( true );
- ui->twitterUserTweetLineEdit->setEnabled( false );
+ ui->twitterTweetGotTomahawkButton->setText( tr( "Tweet!" ) );
if ( m_plugin->twitterOAuthToken().isEmpty() || m_plugin->twitterOAuthTokenSecret().isEmpty() || m_plugin->twitterScreenName().isEmpty() )
{
ui->twitterStatusLabel->setText( tr( "Status: No saved credentials" ) );
ui->twitterAuthenticateButton->setText( tr( "Authenticate" ) );
- ui->twitterInstructionsInfoLabel->setVisible( false );
- ui->twitterGlobalTweetLabel->setVisible( false );
- ui->twitterTweetGotTomahawkButton->setVisible( false );
- ui->twitterUserTweetLineEdit->setVisible( false );
- ui->twitterTweetComboBox->setVisible( false );
+ ui->twitterSyncGroupBox->setVisible( false );
emit twitterAuthed( false );
}
@@ -65,11 +60,8 @@ TwitterConfigWidget::TwitterConfigWidget( TwitterPlugin* plugin, QWidget *parent
{
ui->twitterStatusLabel->setText( tr( "Status: Credentials saved for %1" ).arg( m_plugin->twitterScreenName() ) );
ui->twitterAuthenticateButton->setText( tr( "De-authenticate" ) );
- ui->twitterInstructionsInfoLabel->setVisible( true );
- ui->twitterGlobalTweetLabel->setVisible( true );
- ui->twitterTweetGotTomahawkButton->setVisible( true );
- ui->twitterUserTweetLineEdit->setVisible( true );
- ui->twitterTweetComboBox->setVisible( true );
+ ui->twitterSyncGroupBox->setVisible( true );
+ ui->twitterUserTweetLineEdit->setVisible( false );
emit twitterAuthed( true );
}
@@ -123,11 +115,10 @@ TwitterConfigWidget::authenticateVerifyReply( const QTweetUser &user )
ui->twitterStatusLabel->setText( tr( "Status: Credentials saved for %1" ).arg( m_plugin->twitterScreenName() ) );
ui->twitterAuthenticateButton->setText( tr( "De-authenticate" ) );
- ui->twitterInstructionsInfoLabel->setVisible( true );
- ui->twitterGlobalTweetLabel->setVisible( true );
- ui->twitterTweetGotTomahawkButton->setVisible( true );
- ui->twitterUserTweetLineEdit->setVisible( true );
- ui->twitterTweetComboBox->setVisible( true );
+ ui->twitterSyncGroupBox->setVisible( true );
+ ui->twitterTweetComboBox->setCurrentIndex( 0 );
+ ui->twitterUserTweetLineEdit->setVisible( false );
+ ui->twitterTweetGotTomahawkButton->setText( tr( "Tweet!" ) );
m_plugin->connectPlugin( false );
@@ -155,11 +146,7 @@ TwitterConfigWidget::deauthenticateTwitter()
ui->twitterStatusLabel->setText(tr("Status: No saved credentials"));
ui->twitterAuthenticateButton->setText( tr( "Authenticate" ) );
- ui->twitterInstructionsInfoLabel->setVisible( false );
- ui->twitterGlobalTweetLabel->setVisible( false );
- ui->twitterTweetGotTomahawkButton->setVisible( false );
- ui->twitterUserTweetLineEdit->setVisible( false );
- ui->twitterTweetComboBox->setVisible( false );
+ ui->twitterSyncGroupBox->setVisible( false );
emit twitterAuthed( false );
emit sizeHintChanged();
@@ -169,19 +156,15 @@ void
TwitterConfigWidget::tweetComboBoxIndexChanged( int index )
{
Q_UNUSED( index );
- if( ui->twitterTweetComboBox->currentText() == tr( "Global Tweet" ) ) //FIXME: use data!
- {
- ui->twitterUserTweetLineEdit->setReadOnly( true );
- ui->twitterUserTweetLineEdit->setEnabled( false );
- }
+ if ( ui->twitterTweetComboBox->currentText() == tr( "Global Tweet" ) ) //FIXME: use data!
+ ui->twitterUserTweetLineEdit->setVisible( false );
else
- {
- ui->twitterUserTweetLineEdit->setReadOnly( false );
- ui->twitterUserTweetLineEdit->setEnabled( true );
- }
+ ui->twitterUserTweetLineEdit->setVisible( true );
- if( ui->twitterTweetComboBox->currentText() == tr( "Direct Message" ) ) //FIXME: use data!
+ if ( ui->twitterTweetComboBox->currentText() == tr( "Direct Message" ) ) //FIXME: use data!
ui->twitterTweetGotTomahawkButton->setText( tr( "Send Message!" ) );
+ else if ( ui->twitterTweetComboBox->currentText() == tr( "@Mention" ) )
+ ui->twitterTweetGotTomahawkButton->setText( tr( "Send Mention!" ) );
else
ui->twitterTweetGotTomahawkButton->setText( tr( "Tweet!" ) );
}
diff --git a/src/sip/twitter/twitterconfigwidget.ui b/src/sip/twitter/twitterconfigwidget.ui
index 57035c5de..f60dbb5f8 100644
--- a/src/sip/twitter/twitterconfigwidget.ui
+++ b/src/sip/twitter/twitterconfigwidget.ui
@@ -6,17 +6,23 @@
<rect>
<x>0</x>
<y>0</y>
- <width>526</width>
- <height>358</height>
+ <width>580</width>
+ <height>390</height>
</rect>
</property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
<property name="minimumSize">
<size>
- <width>0</width>
- <height>0</height>
+ <width>580</width>
+ <height>390</height>
</size>
</property>
- <layout class="QVBoxLayout" name="verticalLayout">
+ <layout class="QVBoxLayout" name="verticalLayout_4">
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
@@ -27,13 +33,19 @@
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
- <height>20</height>
+ <height>0</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="label_4">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
<property name="text">
<string/>
</property>
@@ -44,6 +56,12 @@
</item>
<item>
<widget class="QLabel" name="label">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
<property name="font">
<font>
<pointsize>11</pointsize>
@@ -61,10 +79,13 @@
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Expanding</enum>
+ </property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
- <height>20</height>
+ <height>0</height>
</size>
</property>
</spacer>
@@ -72,17 +93,30 @@
</layout>
</item>
<item>
- <layout class="QVBoxLayout" name="twitterVertLayout">
+ <spacer name="verticalSpacer_4">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QLabel" name="twitterInfoLabel">
<property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
- <string>Authenticating with Twitter allows you to discover and play music from your Twitter friends running Tomahawk.</string>
+ <string>The Twitter plugin allows you to discover and play music from your Twitter friends running Tomahawk and post messages to your account.</string>
</property>
<property name="wordWrap">
<bool>true</bool>
@@ -90,19 +124,15 @@
</widget>
</item>
<item>
- <widget class="QLabel" name="label_2">
- <property name="text">
- <string>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.</string>
- </property>
- <property name="wordWrap">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <layout class="QHBoxLayout" name="twitterHorizontalLayout">
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QLabel" name="twitterStatusLabel">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
<property name="text">
<string>Status: No saved credentials</string>
</property>
@@ -111,8 +141,27 @@
</property>
</widget>
</item>
+ <item>
+ <spacer name="horizontalSpacer_3">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
<item>
<widget class="QPushButton" name="twitterAuthenticateButton">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
<property name="text">
<string>Authenticate with Twitter</string>
</property>
@@ -123,121 +172,206 @@
</layout>
</item>
<item>
- <widget class="QLabel" name="twitterInstructionsInfoLabel">
- <property name="text">
- <string>Here's how it works: just press one of the buttons below to tweet "Got Tomahawk?" and some necessary information. Then be (very) patient. Twitter is an asynchronous protocol so it can take a bit!
+ <spacer name="verticalSpacer_3">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QGroupBox" name="twitterSyncGroupBox">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="title">
+ <string>Twitter Connections</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout_3">
+ <item>
+ <widget class="QLabel" name="twitterInstructionsInfoLabel">
+ <property name="text">
+ <string>
+If you only want to post tweets, you're done.
-If connections to peers seem to have been lost, just press the appropriate button again to re-post a tweet for resynchronization.</string>
- </property>
- <property name="wordWrap">
- <bool>true</bool>
- </property>
+If you want to connect Tomahawk to your friends using Twitter, select the type of tweet and press the button below to send a sync message. You must both be following each other as Direct Messages are used. Then be (very) patient -- it can take several minutes!
+
+You can re-send a sync message at any time simply by sending another tweet using the button.</string>
+ </property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="verticalSpacer">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Expanding</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <layout class="QVBoxLayout" name="twitterTweetVLayout">
+ <property name="sizeConstraint">
+ <enum>QLayout::SetFixedSize</enum>
+ </property>
+ <item>
+ <widget class="QLabel" name="twitterGlobalTweetLabel">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>Select the kind of tweet you would like, then press the button to post it:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="verticalSpacer_2">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>10</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="twitterGlobalTweetHLayout">
+ <item>
+ <widget class="QComboBox" name="twitterTweetComboBox">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <item>
+ <property name="text">
+ <string>Global Tweet</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>@Mention</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Direct Message</string>
+ </property>
+ </item>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_4">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>10</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QLineEdit" name="twitterUserTweetLineEdit">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>250</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="placeholderText">
+ <string>e.g. @tomahawk</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_6">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>10</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QPushButton" name="twitterTweetGotTomahawkButton">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>Send Message</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_5">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </item>
+ </layout>
</widget>
</item>
- <item>
- <spacer name="verticalSpacer">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>40</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <layout class="QVBoxLayout" name="twitterTweetVLayout">
- <item>
- <widget class="QLabel" name="twitterGlobalTweetLabel">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>Select the kind of tweet you would like, then press the button to post it:</string>
- </property>
- </widget>
- </item>
- <item>
- <layout class="QHBoxLayout" name="twitterGlobalTweetHLayout">
- <item>
- <widget class="QComboBox" name="twitterTweetComboBox">
- <property name="sizePolicy">
- <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <item>
- <property name="text">
- <string>Global Tweet</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>@Mention</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Direct Message</string>
- </property>
- </item>
- </widget>
- </item>
- <item>
- <widget class="QLineEdit" name="twitterUserTweetLineEdit">
- <property name="sizePolicy">
- <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>250</width>
- <height>0</height>
- </size>
- </property>
- <property name="placeholderText">
- <string>e.g. @tomahawkplayer</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="twitterTweetGotTomahawkButton">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>Tweet!</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- </layout>
- </item>
- <item>
- <spacer name="verticalSpacer_2">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>40</height>
- </size>
- </property>
- </spacer>
- </item>
</layout>
</widget>
<resources>