From 3911a92a63e61294f984db6982997e6724b1cfd0 Mon Sep 17 00:00:00 2001
From: Ale Rimoldi <ale@graphicslab.org>
Date: Thu, 29 Oct 2015 00:55:18 +0100
Subject: [PATCH] apply the patch by dawoodalbadi

---
 scribus/ui/propertiespalette_image.cpp    |  57 ++++++++++
 scribus/ui/propertiespalette_image.h      |   2 +
 scribus/ui/propertiespalette_imagebase.ui | 131 +++++++++++++++++-----
 3 files changed, 165 insertions(+), 25 deletions(-)

diff --git a/scribus/ui/propertiespalette_image.cpp b/scribus/ui/propertiespalette_image.cpp
index b0ae4ea434..5ee684c6ad 100644
--- a/scribus/ui/propertiespalette_image.cpp
+++ b/scribus/ui/propertiespalette_image.cpp
@@ -110,6 +110,8 @@ PropertiesPalette_Image::PropertiesPalette_Image( QWidget* parent) : QWidget(par
 	connect(renderIntent       , SIGNAL(activated(int))      , this, SLOT(handleIntent()));
 	connect(compressionMethod  , SIGNAL(activated(int))      , this, SLOT(handleCompressionMethod()));
 	connect(compressionQuality , SIGNAL(activated(int))      , this, SLOT(handleCompressionQuality()));
+	connect(alignvertical , SIGNAL(currentIndexChanged(int)) , this, SLOT(alignImageVertical(int)));
+	connect(alignhorozintal , SIGNAL(currentIndexChanged(int)), this, SLOT(alignImageHorozintal(int)));
 }
 
 void PropertiesPalette_Image::updateSpinBoxConstants()
@@ -902,4 +904,59 @@ void PropertiesPalette_Image::spinboxFinishUserAction()
 	}
 }
 
+void PropertiesPalette_Image::alignImageVertical(int idx){
+    if (!m_ScMW || m_ScMW->scriptIsRunning())
+	return;
 
+    if ((m_haveDoc) && (m_haveItem) && (m_item->asImageFrame()))
+    {
+	double newY;
+	double imageHeight = m_item->pixm.height() * m_item->imageYScale() * m_item->pixm.imgInfo.lowResScale;
+	double frameHeight= m_item->height();
+
+	switch (idx) 
+	{
+		case 1:
+			newY = 0;
+			break;
+		case 2: 
+			newY = (frameHeight - imageHeight) / 2.0;
+			break;
+		case 3: 
+			newY = frameHeight - imageHeight;
+			break;
+		default:
+			newY = m_item->imageYOffset(); //do nothing
+			break;
+	}
+	m_doc->itemSelection_SetImageOffset(m_item->imageXOffset(), newY / m_item->imageYScale());
+    }
+}
+
+void PropertiesPalette_Image::alignImageHorozintal(int idx) {
+    if (!m_ScMW || m_ScMW->scriptIsRunning())
+	return;
+
+    if ((m_haveDoc) && (m_haveItem) && (m_item->asImageFrame()))
+    {
+	double newX;
+	double imageWidth = m_item->pixm.width() * m_item->imageXScale() * m_item->pixm.imgInfo.lowResScale;
+	double frameWidth = m_item->width();
+	switch (idx)
+	{
+		case 1: 
+			newX = 0;
+			break;
+		case 2:
+			newX = (frameWidth - imageWidth) / 2.0;
+			break;
+		case 3:
+			newX = frameWidth - imageWidth;
+			break;
+		default:
+			newX = m_item->imageXOffset(); // do nothing
+			break;
+	}
+	m_doc->itemSelection_SetImageOffset(newX / m_item->imageXScale(), m_item->imageYOffset());
+    }
+}
diff --git a/scribus/ui/propertiespalette_image.h b/scribus/ui/propertiespalette_image.h
index fb4e46baa2..d4fdb12d53 100644
--- a/scribus/ui/propertiespalette_image.h
+++ b/scribus/ui/propertiespalette_image.h
@@ -103,6 +103,8 @@ private slots:
 
 	void handleImageEffects();
 	void handleExtImgProperties();
+	void alignImageVertical(int);
+	void alignImageHorozintal(int);
 
 signals:
 	void UpdtGui(int);
diff --git a/scribus/ui/propertiespalette_imagebase.ui b/scribus/ui/propertiespalette_imagebase.ui
index cfb44ca751..eb03f92aa7 100644
--- a/scribus/ui/propertiespalette_imagebase.ui
+++ b/scribus/ui/propertiespalette_imagebase.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>286</width>
-    <height>617</height>
+    <width>297</width>
+    <height>690</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -17,7 +17,16 @@
    <property name="spacing">
     <number>2</number>
    </property>
-   <property name="margin">
+   <property name="leftMargin">
+    <number>2</number>
+   </property>
+   <property name="topMargin">
+    <number>2</number>
+   </property>
+   <property name="rightMargin">
+    <number>2</number>
+   </property>
+   <property name="bottomMargin">
     <number>2</number>
    </property>
    <item>
@@ -63,13 +72,6 @@
        </property>
       </widget>
      </item>
-     <item row="3" column="0">
-      <widget class="QLabel" name="yposImgLabel">
-       <property name="text">
-        <string>Y-Pos:</string>
-       </property>
-      </widget>
-     </item>
      <item row="3" column="1">
       <widget class="ScrSpinBox" name="imageYOffsetSpinBox">
        <property name="sizePolicy">
@@ -80,6 +82,13 @@
        </property>
       </widget>
      </item>
+     <item row="3" column="0">
+      <widget class="QLabel" name="yposImgLabel">
+       <property name="text">
+        <string>Y-Pos:</string>
+       </property>
+      </widget>
+     </item>
      <item row="1" column="1">
       <widget class="ScrSpinBox" name="imagePageNumber">
        <property name="specialValueText">
@@ -89,6 +98,77 @@
      </item>
     </layout>
    </item>
+   <item>
+    <widget class="QGroupBox" name="alignmentGroupBox">
+     <property name="title">
+      <string>Alignment</string>
+     </property>
+     <layout class="QFormLayout" name="formLayout">
+      <item row="0" column="0">
+       <widget class="QLabel" name="label_2">
+        <property name="text">
+         <string>Horizontal</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0">
+       <widget class="QLabel" name="label_3">
+        <property name="text">
+         <string>Vertical</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QComboBox" name="alignhorozintal">
+        <item>
+         <property name="text">
+          <string>None</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Left</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Center</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Right</string>
+         </property>
+        </item>
+       </widget>
+      </item>
+      <item row="2" column="1">
+       <widget class="QComboBox" name="alignvertical">
+        <item>
+         <property name="text">
+          <string>None</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Top</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Middle</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Bottom</string>
+         </property>
+        </item>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
    <item>
     <widget class="QGroupBox" name="scalingGroupBox">
      <property name="title">
@@ -200,17 +280,17 @@
         </property>
        </widget>
       </item>
-      <item row="7" column="1">
-       <widget class="QCheckBox" name="cbProportional">
+      <item row="7" column="0">
+       <widget class="QRadioButton" name="frameScale">
         <property name="text">
-         <string>Proportional</string>
+         <string>To Frame Size</string>
         </property>
        </widget>
       </item>
-      <item row="6" column="0">
-       <widget class="QRadioButton" name="frameScale">
+      <item row="8" column="0">
+       <widget class="QCheckBox" name="cbProportional">
         <property name="text">
-         <string>To Frame Size</string>
+         <string>Proportional</string>
         </property>
        </widget>
       </item>
@@ -223,13 +303,6 @@
       <string>Color Management</string>
      </property>
      <layout class="QGridLayout" name="gridLayout_4">
-      <item row="0" column="0">
-       <widget class="QLabel" name="inputProfLabel">
-        <property name="text">
-         <string>Input Profile</string>
-        </property>
-       </widget>
-      </item>
       <item row="0" column="1">
        <widget class="QComboBox" name="inputProfiles">
         <property name="sizePolicy">
@@ -250,6 +323,13 @@
       <item row="1" column="1">
        <widget class="QComboBox" name="renderIntent"/>
       </item>
+      <item row="0" column="0">
+       <widget class="QLabel" name="inputProfLabel">
+        <property name="text">
+         <string>Input Profile</string>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>
@@ -326,6 +406,9 @@
      </item>
     </layout>
    </item>
+   <item>
+    <layout class="QVBoxLayout" name="verticalLayout_2"/>
+   </item>
    <item>
     <spacer name="verticalSpacer">
      <property name="orientation">
@@ -365,8 +448,6 @@
   <tabstop>imgDpiY</tabstop>
   <tabstop>keepImageWHRatioButton</tabstop>
   <tabstop>keepImageDPIRatioButton</tabstop>
-  <tabstop>frameScale</tabstop>
-  <tabstop>cbProportional</tabstop>
   <tabstop>inputProfiles</tabstop>
   <tabstop>renderIntent</tabstop>
   <tabstop>compressionMethod</tabstop>