IndigoJo / qtm / changeset / 01c39ea18aad

Up to file-list AccountsDialog.cc:

@@ -135,6 +135,9 @@ void AccountsDialog::changeListIndex( in
   lePort->setText( accountList[currentRow].port );
   leLogin->setText( accountList[currentRow].login );
   lePassword->setText( accountList[currentRow].password );
   if( accountList[currentRow].hostedBlogType != -1 )
     cbHostedBlogType->setCurrentIndex( accountList[currentRow].hostedBlogType );
   chCategoriesEnabled->setCheckState( accountList[currentRow].categoriesEnabled ?
 				      Qt::Checked : Qt::Unchecked );
@@ -287,7 +290,7 @@ void AccountsDialog::on_leBlogURI_return
     return;
+  }
-  bool found = false;
+  //bool found = false;
   //  QStringList hostedAccountStrings, hostedAccountServers, hostedAccountLocations;
   QStringList wpmuHosts;
   wpmuHosts << "wordpress.com" << "blogsome.com" << "blogs.ie"
@@ -334,10 +337,10 @@ void AccountsDialog::on_leBlogURI_return
+  }
   // Is this a self-hosted Wordpress, Textpattern or Drupal site?
   if( cbHostedBlogType->currentIndex() >= 4 &&
       cbHostedBlogType->currentIndex() <= 6 ) {
   if( cbHostedBlogType->currentIndex() >= 5 &&
       cbHostedBlogType->currentIndex() <= 7 ) {
     QString endpoint;
-    if( cbHostedBlogType->currentIndex() == 6 ) // i.e. Textpattern
+    if( cbHostedBlogType->currentIndex() == 7 ) // i.e. Textpattern
       endpoint = "rpc/index.php";
     else
       endpoint = "xmlrpc.php";
@@ -483,8 +486,6 @@ void AccountsDialog::on_leLocation_textE
 void AccountsDialog::on_lePort_textEdited( const QString &text )
+{
   bool ok;
   if( currentRow != -1 )
     accountList[currentRow].port = text;
+}
@@ -528,25 +529,31 @@ void AccountsDialog::on_cbHostedBlogType
 void AccountsDialog::on_cbHostedBlogType_activated( int newIndex )
+{
   switch( newIndex ) {
-  case 0: // wordpress.com
+  case 1: // wordpress.com
     leServer->setText( "yourblog.wordpress.com" );
     leLocation->setText( "/xmlrpc.php" );
     break;
-  case 1: // TypePad
+  case 2: // TypePad
     leServer->setText( "www.typepad.com" );
     leLocation->setText( "/t/api" );
     break;
-  case 2: // SquareSpace
+  case 3: // SquareSpace
     leServer->setText( "www.squarespace.com" );
     leLocation->setText( "/do/process/external/PostInterceptor" );
     break;
   case 3: // Movable type
   case 4: // Self-hosted Wordpress
-  case 5: // TextPattern
+  case 4: // Movable type
   case 5: // Self-hosted Wordpress
     leServer->clear();
     leLocation->clear();
     break;
   case 6: // Drupal
   case 7: // TextPattern
     chTB->setChecked( false ); // these platforms don't support it
     leServer->clear();
     leLocation->clear();
     break;
+  }
   accountList[currentRow].hostedBlogType = newIndex;
+}
 bool AccountsDialog::eventFilter( QObject *obj, QEvent *event )
@@ -560,7 +567,7 @@ bool AccountsDialog::eventFilter( QObjec
             return QObject::eventFilter( obj, event );
+       }
+   }
    return QObject::eventFilter( obj, event );
+}

Up to file-list AccountsDialog.h:

@@ -47,6 +47,7 @@ public:
 public:
   typedef struct _acct {
     QString id;
     int hostedBlogType;
     QString name;
     QString server;
     QString location;

Up to file-list AccountsForm.ui:

          </item>
          <item row="1" column="1" colspan="3" >
           <widget class="QComboBox" name="cbHostedBlogType" >
             <item>
               <property name="text">
                 <string>None</string>
               </property>
             </item>
            <item>
             <property name="text" >
              <string>Wordpress.com</string>

Up to file-list EditingWindow.cc:

@@ -1205,10 +1205,11 @@ void EditingWindow::getAccounts()
   QDomNodeList accountsList, thisAccountsAttribs;
   QDomDocument newAccountsDom;
   QDomElement newQTMAccounts, newAccount, detailElement, nameElement, serverElement, locationElement,
-    portElement, loginElement, pwdElement, blogsElement, boolElement, attribsElement;
+    portElement, loginElement, pwdElement, blogsElement, boolElement, attribsElement, hbtElement;
   QString oldCurrentAccountId, oldBlogid, currentTitle;
   QStringList thisAccountsAttribStrings;
   int i, j;
   bool ok;
   // Extract accounts list from account tree
   accountsList = accountsDom.elementsByTagName( "account" );
@@ -1223,6 +1224,11 @@ void EditingWindow::getAccounts()
     acct.login = detailElement.firstChildElement( "login" ).text();
     acct.password = detailElement.firstChildElement( "password" ).text();
     acct.hostedBlogType = 0;
     int hbt = detailElement.firstChildElement( "hostedBlogType" ).text().toInt( &ok );
     if( ok )
       acct.hostedBlogType = hbt;
     acct.categoriesEnabled = false;
     acct.postDateTime = false;
     acct.comments = false;
@@ -1268,6 +1274,8 @@ void EditingWindow::getAccounts()
       detailElement = newAccountsDom.createElement( "details" );
       nameElement = newAccountsDom.createElement( "title" );
       nameElement.appendChild( newAccountsDom.createTextNode( returnedAccountsList.at( i ).name ) );
       hbtElement = newAccountsDom.createElement( "hostedBlogType" );
       hbtElement.appendChild( newAccountsDom.createTextNode( QString::number( returnedAccountsList.at( i ).hostedBlogType ) ) );
       serverElement = newAccountsDom.createElement( "server" );
       serverElement.appendChild( newAccountsDom.createTextNode( returnedAccountsList.at( i ).server ) );
       locationElement = newAccountsDom.createElement( "location" );
@@ -1280,6 +1288,7 @@ void EditingWindow::getAccounts()
       pwdElement.appendChild( newAccountsDom.createTextNode( returnedAccountsList.at( i ).password ) );
       detailElement.appendChild( nameElement );
       detailElement.appendChild( hbtElement );
       detailElement.appendChild( serverElement );
       detailElement.appendChild( locationElement );
       detailElement.appendChild( portElement );

commit 103:	01c39ea18aad
parent 102:	03145eb3c6d3
branch:	default

Bitbucket

IndigoJo / qtm (http://qtm.blogistan.co.uk/)