[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdepim/blogilo/src
From:       Mehrdad Momeny <mehrdad.momeny () gmail ! com>
Date:       2010-11-08 19:52:26
Message-ID: 20101108195226.62180AC89B () svn ! kde ! org
[Download RAW message or body]

SVN commit 1194344 by momeny:

Keep Aspect Ratio for add/edit image dialog
Default drag n drop in editor

 M  +29 -6     composer/dialogs/addeditimage.cpp  
 M  +2 -1      composer/dialogs/addeditimage.h  
 M  +3 -0      composer/dialogs/editimagebase.ui  
 M  +3 -1      composer/texteditor.cpp  
 M  +0 -13     toolbox.cpp  
 M  +0 -2      toolbox.h  


--- trunk/KDE/kdepim/blogilo/src/composer/dialogs/addeditimage.cpp #1194343:1194344
@@ -36,7 +36,7 @@
 #include "bilbomedia.h"
 
 AddEditImage::AddEditImage(QWidget* parent, QMap< QString, QString > mediaToEdit)
-: AddMediaDialog(parent)
+: AddMediaDialog(parent), ratio(0)
 {
     editFrame = new QFrame(this);
     editFrame->setFrameShape(QFrame::StyledPanel);
@@ -67,7 +67,10 @@
             editImageWidgetUi.txtLink->setVisible(false);
         }
     }
-
+    connect(editImageWidgetUi.spinboxWidth, SIGNAL(valueChanged(int)),
+            this, SLOT(slotCheckRatio(int)));
+    connect(editImageWidgetUi.spinboxHeight, SIGNAL(valueChanged(int)),
+            this, SLOT(slotCheckRatio(int)) );
 //     QStringList mimeFilter;
 //     mimeFilter << "image/gif" << "image/jpeg" << "image/png" ;
 //     ui.kurlreqMediaUrl->fileDialog()->setMimeFilter( mimeFilter );
@@ -87,7 +90,12 @@
 #else
     path = KFileDialog::getImageOpenUrl( KUrl(), this, i18n("Choose a file") ).path();
 #endif
+    QImage img(path);
     ui.urlReqLineEdit->setText(path);
+    editImageWidgetUi.btnKeepRatio->setChecked(true);
+    ratio = img.width()/img.height();
+    editImageWidgetUi.spinboxWidth->setValue(img.width());
+    editImageWidgetUi.spinboxHeight->setValue(img.height());
 }
 
 void AddEditImage::slotButtonClicked(int button)
@@ -108,16 +116,16 @@
 QString AddEditImage::getAlignment()
 {
     switch(editImageWidgetUi.alignment->currentIndex()){
-        case 0:
-            return QString();
-            break;
         case 1:
             return "right";
             break;
         case 2:
-        default:
             return "left";
             break;
+        case 0:
+        default:
+            return QString();
+            break;
     }
 }
 
@@ -131,4 +139,19 @@
         editImageWidgetUi.alignment->setCurrentIndex(2);
 }
 
+void AddEditImage::slotCheckRatio(int value)
+{
+    if(editImageWidgetUi.btnKeepRatio->isChecked() && ratio > 0) {
+        if(sender() == editImageWidgetUi.spinboxHeight){
+            editImageWidgetUi.spinboxWidth->setValue(value*ratio);
+        } else if(sender() == editImageWidgetUi.spinboxWidth){
+            editImageWidgetUi.spinboxHeight->setValue(value/ratio);
+        }
+    } else {
+        if( editImageWidgetUi.spinboxWidth->value() > 0 &&
+            editImageWidgetUi.spinboxHeight->value() > 0 )
+            ratio = editImageWidgetUi.spinboxWidth->value() / editImageWidgetUi.spinboxHeight->value();
+    }
+}
+
 #include "composer/dialogs/addeditimage.moc"
--- trunk/KDE/kdepim/blogilo/src/composer/dialogs/addeditimage.h #1194343:1194344
@@ -49,6 +49,7 @@
 
 protected slots:
     virtual void slotSelectLocalFile();
+    void slotCheckRatio(int value);
 
 private:
     QString getAlignment();
@@ -56,7 +57,7 @@
     QFrame *editFrame;
     Ui::EditImageBase editImageWidgetUi;
     bool isEditing;
-
+    int ratio;
 };
 
 #endif
--- trunk/KDE/kdepim/blogilo/src/composer/dialogs/editimagebase.ui #1194343:1194344
@@ -146,6 +146,9 @@
      <property name="checkable">
       <bool>true</bool>
      </property>
+     <property name="checked">
+      <bool>true</bool>
+     </property>
     </widget>
    </item>
    <item row="1" column="0">
--- trunk/KDE/kdepim/blogilo/src/composer/texteditor.cpp #1194343:1194344
@@ -82,6 +82,7 @@
 
 void WebView::dragEnterEvent ( QDragEnterEvent *event )
 {
+    KWebView::dragEnterEvent(event);
     //uncomment lines below when drag n drop support added
 //     if ( event->mimeData()->hasText() )
 //         event->acceptProposedAction();
@@ -89,6 +90,7 @@
 
 void WebView::dropEvent ( QDropEvent *event )
 {
+    KWebView::dropEvent(event);
     //TODO support drag n drop
 //     QString textToInsert = event->mimeData()->text();
 //     kDebug()<<textToInsert;
@@ -325,7 +327,7 @@
     formatTypes << i18n( "Heading 6" );
     formatTypes << i18n( "Pre Formatted" );
     actFormatType->setItems( formatTypes );
-    actFormatType->setMaxComboViewCount( 3 );
+//     actFormatType->setMaxComboViewCount( 3 );
     actFormatType->setCurrentAction( i18n( "Paragraph" ) );
     connect( actFormatType, SIGNAL( triggered( const QString& ) ),
              this, SLOT(slotChangeFormatType(QString)) );
--- trunk/KDE/kdepim/blogilo/src/toolbox.cpp #1194343:1194344
@@ -382,13 +382,6 @@
     return list;
 }
 
-QList< int > Toolbox::selectedCategoriesId()
-{
-    ///TODO Implement it
-    kDebug() << "NOT IMPLEMENTED YET!";
-    return QList<int>();
-}
-
 void Toolbox::setSelectedCategories( const QStringList &list )
 {
     unCheckCatList();
@@ -399,12 +392,6 @@
     }
 }
 
-void Toolbox::setSelectedCategories( const QList< int > & )
-{
-    ///TODO Implement it
-    kDebug() << "NOT IMPLEMENTED YET!";
-}
-
 QStringList Toolbox::currentTags()
 {
     kDebug();
--- trunk/KDE/kdepim/blogilo/src/toolbox.h #1194343:1194344
@@ -87,9 +87,7 @@
 private:
     QStringList selectedCategoriesTitle();
     QList<Category> selectedCategories();
-    QList<int> selectedCategoriesId();
     void setSelectedCategories( const QStringList& );
-    void setSelectedCategories( const QList<int>& );
     QStringList currentTags();
     void clearCatList();
     void unCheckCatList();
[prev in list] [next in list] [prev in thread] [next in thread]