AB 3.14 version

final commit 3.14 beta
kmkolasinski · Apr 23, 2015 · ae1be8a · ae1be8a
1 parent b212a52
commit ae1be8a
Show file tree

Hide file tree

Showing 12 changed files with 422 additions and 5 deletions.
diff --git a/Sources/content.qrc b/Sources/content.qrc
@@ -56,5 +56,7 @@
         <file>resources/showUVs.png</file>
         <file>resources/resetCamera.png</file>
         <file>resources/centerCamCursor.png</file>
+        <file>resources/copyToCB.png</file>
+        <file>resources/pasteFromCB.png</file>
     </qresource>
 </RCC>
diff --git a/Sources/formimageprop.cpp b/Sources/formimageprop.cpp
@@ -16,6 +16,9 @@ FormImageProp::FormImageProp(QMainWindow *parent, QGLWidget* qlW_ptr) :
 
     connect(ui->pushButtonOpenImage,SIGNAL(released()),this,SLOT(open()));
     connect(ui->pushButtonSaveImage,SIGNAL(released()),this,SLOT(save()));
+    connect(ui->pushButtonCopyToClipboard,SIGNAL(released()),this,SLOT(copyToClipboard()));
+    connect(ui->pushButtonPasteFromClipboard,SIGNAL(released()),this,SLOT(pasteFromClipboard()));
+
     connect(ui->pushButtonRestoreSettings,SIGNAL(released()),this,SLOT(reloadImageSettings()));
 
     connect(ui->checkBoxRemoveShading,SIGNAL(clicked()),this,SLOT(updateGuiCheckBoxes()));
@@ -980,3 +983,28 @@ void FormImageProp::reloadImageSettings(){
 }
 
 
+void FormImageProp::pasteFromClipboard(){
+    const QClipboard *clipboard = QApplication::clipboard();
+    const QMimeData *mimeData = clipboard->mimeData();
+
+    if (mimeData->hasImage()) {
+        qDebug() << "<FormImageProp> Image :"+
+                    PostfixNames::getTextureName(imageProp.imageType)+
+                    " loaded from clipboard.";
+        QPixmap pixmap = qvariant_cast<QPixmap>(mimeData->imageData());
+        QImage image = pixmap.toImage();
+        pasteImageFromClipboard(image);
+
+    }
+}
+void FormImageProp::copyToClipboard(){
+
+    qDebug() << "<FormImageProp> Image :"+
+                PostfixNames::getTextureName(imageProp.imageType)+
+                " copied to clipboard.";
+
+    QApplication::processEvents();
+    image = imageProp.getImage();
+    QApplication::clipboard()->setImage(image,QClipboard::Clipboard);
+}
+
diff --git a/Sources/formimageprop.h b/Sources/formimageprop.h
@@ -53,6 +53,8 @@ public slots:
 
 
     void reloadImageSettings();
+    void pasteFromClipboard();
+    void copyToClipboard();
 
     void updateComboBoxes(int index);
     void updateGuiSpinBoxesAndLabes(int);

diff --git a/Sources/formimageprop.ui b/Sources/formimageprop.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>279</width>
-    <height>2511</height>
+    <height>2611</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -127,7 +127,7 @@
        </property>
       </widget>
      </item>
-     <item row="0" column="4">
+     <item row="0" column="5">
       <widget class="QPushButton" name="pushButtonSaveImage">
        <property name="toolTip">
         <string>Save current image (Ctrl+S)</string>
@@ -166,6 +166,52 @@
        </property>
       </spacer>
      </item>
+     <item row="0" column="4">
+      <widget class="QPushButton" name="pushButtonPasteFromClipboard">
+       <property name="toolTip">
+        <string>Paste from clipboard</string>
+       </property>
+       <property name="statusTip">
+        <string>Paste from clipboard</string>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+       <property name="icon">
+        <iconset resource="content.qrc">
+         <normaloff>:/resources/pasteFromCB.png</normaloff>:/resources/pasteFromCB.png</iconset>
+       </property>
+       <property name="iconSize">
+        <size>
+         <width>32</width>
+         <height>32</height>
+        </size>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="3">
+      <widget class="QPushButton" name="pushButtonCopyToClipboard">
+       <property name="toolTip">
+        <string>Copy to clipboard</string>
+       </property>
+       <property name="statusTip">
+        <string>Copy to clipboard</string>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+       <property name="icon">
+        <iconset resource="content.qrc">
+         <normaloff>:/resources/copyToCB.png</normaloff>:/resources/copyToCB.png</iconset>
+       </property>
+       <property name="iconSize">
+        <size>
+         <width>32</width>
+         <height>32</height>
+        </size>
+       </property>
+      </widget>
+     </item>
     </layout>
    </item>
    <item>

diff --git a/Sources/formmaterialindicesmanager.cpp b/Sources/formmaterialindicesmanager.cpp
@@ -9,6 +9,8 @@ FormMaterialIndicesManager::FormMaterialIndicesManager(QMainWindow *parent, QGLW
     imageProp.glWidget_ptr = qlW_ptr;
 
     connect(ui->pushButtonOpenMaterialImage,SIGNAL(released()),this,SLOT(open()));
+    connect(ui->pushButtonCopyToClipboard,SIGNAL(released()),this,SLOT(copyToClipboard()));
+    connect(ui->pushButtonPasteFromClipboard,SIGNAL(released()),this,SLOT(pasteFromClipboard()));
     connect(ui->checkBoxDisableMaterials,SIGNAL(toggled(bool)),this,SLOT(toggleMaterials(bool)));
 
     connect(ui->listWidgetMaterialIndices,SIGNAL(currentRowChanged(int)),this,SLOT(changeMaterial(int)));
@@ -265,3 +267,28 @@ void FormMaterialIndicesManager::chooseMaterialByColor(QColor color){
     }
 }
 
+
+void FormMaterialIndicesManager::pasteFromClipboard(){
+    const QClipboard *clipboard = QApplication::clipboard();
+    const QMimeData *mimeData = clipboard->mimeData();
+
+    if (mimeData->hasImage()) {
+        qDebug() << "<FormImageProp> Image :"+
+                    PostfixNames::getTextureName(imageProp.imageType)+
+                    " loaded from clipboard.";
+        QPixmap pixmap = qvariant_cast<QPixmap>(mimeData->imageData());
+        QImage image = pixmap.toImage();
+        pasteImageFromClipboard(image);
+
+    }
+}
+void FormMaterialIndicesManager::copyToClipboard(){
+
+    qDebug() << "<FormImageProp> Image :"+
+                PostfixNames::getTextureName(imageProp.imageType)+
+                " copied to clipboard.";
+
+    QApplication::processEvents();
+    image = imageProp.getImage();
+    QApplication::clipboard()->setImage(image,QClipboard::Clipboard);
+}
diff --git a/Sources/formmaterialindicesmanager.h b/Sources/formmaterialindicesmanager.h
@@ -32,7 +32,8 @@ class FormMaterialIndicesManager : public FormImageBase
 
 public slots:
     void changeMaterial(int index);
-
+    void pasteFromClipboard();
+    void copyToClipboard();
     void toggleMaterials(bool toggle);// enable disable materials
     void chooseMaterialByColor(QColor color);// takes a color then searches for similar in materials table
 signals:

diff --git a/Sources/formmaterialindicesmanager.ui b/Sources/formmaterialindicesmanager.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>264</width>
+    <width>270</width>
     <height>405</height>
    </rect>
   </property>
@@ -36,7 +36,7 @@
     <number>2</number>
    </property>
    <item>
-    <layout class="QVBoxLayout" name="verticalLayout_4">
+    <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
       <widget class="QPushButton" name="pushButtonOpenMaterialImage">
        <property name="maximumSize">
@@ -69,6 +69,53 @@
        </property>
       </widget>
      </item>
+     <item>
+      <spacer name="horizontalSpacer">
+       <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="pushButtonCopyToClipboard">
+       <property name="text">
+        <string/>
+       </property>
+       <property name="icon">
+        <iconset resource="content.qrc">
+         <normaloff>:/resources/copyToCB.png</normaloff>:/resources/copyToCB.png</iconset>
+       </property>
+       <property name="iconSize">
+        <size>
+         <width>32</width>
+         <height>32</height>
+        </size>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pushButtonPasteFromClipboard">
+       <property name="text">
+        <string/>
+       </property>
+       <property name="icon">
+        <iconset resource="content.qrc">
+         <normaloff>:/resources/pasteFromCB.png</normaloff>:/resources/pasteFromCB.png</iconset>
+       </property>
+       <property name="iconSize">
+        <size>
+         <width>32</width>
+         <height>32</height>
+        </size>
+       </property>
+      </widget>
+     </item>
     </layout>
    </item>
    <item>

diff --git a/Sources/resources/copyToCB.png b/Sources/resources/copyToCB.png
diff --git a/Sources/resources/copyToCB.svg b/Sources/resources/copyToCB.svg
diff --git a/Sources/resources/pasteFromCB.png b/Sources/resources/pasteFromCB.png