From daa778fd2bf9142ff78954ca30af69e5bb642ef0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?=
 <luisangelsm@gmail.com>
Date: Tue, 16 Apr 2013 22:53:03 +0200
Subject: [PATCH] forzado el ancho del combobox

---
 YACReaderLibrary/library_window.cpp       |  3 ++-
 YACReaderLibrary/server_config_dialog.cpp | 15 ++++++++-------
 compileOSX.sh                             |  3 +++
 releaseOSX.sh                             |  1 +
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/YACReaderLibrary/library_window.cpp b/YACReaderLibrary/library_window.cpp
index d0109240..5f3ab200 100644
--- a/YACReaderLibrary/library_window.cpp
+++ b/YACReaderLibrary/library_window.cpp
@@ -93,7 +93,8 @@ void LibraryWindow::doLayout()
 	m.rotate(-90);
 	m.scale(-1,1);
 	QImage image(":/images/setRead.png");
-	comicFlow->setMarkImage(image.transformed(m,Qt::SmoothTransformation));
+    QImage imageTransformed = image.transformed(m,Qt::SmoothTransformation);
+	comicFlow->setMarkImage(imageTransformed);
 	int heightDesktopResolution = QApplication::desktop()->screenGeometry().height();
 	int height,width;
 	height = heightDesktopResolution*0.39;
diff --git a/YACReaderLibrary/server_config_dialog.cpp b/YACReaderLibrary/server_config_dialog.cpp
index 711f33b7..2118a3ea 100644
--- a/YACReaderLibrary/server_config_dialog.cpp
+++ b/YACReaderLibrary/server_config_dialog.cpp
@@ -34,7 +34,8 @@ QList<QString> addresses()
             tmpAddrPtr=&((struct sockaddr_in *)ifa->ifa_addr)->sin_addr;
             char addressBuffer[INET_ADDRSTRLEN];
             inet_ntop(AF_INET, tmpAddrPtr, addressBuffer, INET_ADDRSTRLEN);
-			localAddreses.push_back(addressBuffer,INET_ADDRSTRLEN);
+            QString add(addressBuffer);
+			localAddreses.push_back(QString(addressBuffer));
             //printf("%s IP Address %s\n", ifa->ifa_name, addressBuffer); 
         } else if (ifa->ifa_addr->sa_family==AF_INET6) { // check it is IP6
             // is a valid IP6 Address
@@ -45,7 +46,7 @@ QList<QString> addresses()
         } 
     }
     if (ifAddrStruct!=NULL) freeifaddrs(ifAddrStruct);
-    return 0;
+    return localAddreses;
 }
 
 #endif
@@ -85,18 +86,17 @@ ServerConfigDialog::ServerConfigDialog(QWidget * parent)
 	propaganda->setOpenExternalLinks(true);
 
 	QLabel * ipLabel = new QLabel(tr("IP address"),this);
-	ipLabel->move(455,75);
+	ipLabel->move(452,75);
 	ipLabel->setStyleSheet("QLabel {color:#1F1F1F; font-size:13px; font-family: Arial; font-weight: bold;}");
 
 	QLabel * portLabel = new QLabel(tr("Port"),this);
-	portLabel->move(455, 114);
+	portLabel->move(452, 114);
 	portLabel->setStyleSheet("QLabel {color:#1F1F1F; font-size:13px; font-family: Arial; font-weight: bold;}");
 
 	ip = new QComboBox(this);
 	connect(ip,SIGNAL(activated(const QString &)),this,SLOT(regenerateQR(const QString &)));
-	ip->move(531,71);
-	ip->setSizeAdjustPolicy(QComboBox::AdjustToContents);
-	ip->setMaximumWidth(100);
+	ip->move(520,71);
+	//ip->setSizeAdjustPolicy(QComboBox::AdjustToContents);
 
 	port = new QLineEdit("8080",this);
 	port->setReadOnly(true);
@@ -234,6 +234,7 @@ void ServerConfigDialog::generateQR()
 	}
 	//qrCode->setText(dir+":8080");
 
+    ip->setFixedWidth(130);
 	
 }
 
diff --git a/compileOSX.sh b/compileOSX.sh
index b11b538b..e14ad16e 100755
--- a/compileOSX.sh
+++ b/compileOSX.sh
@@ -1,4 +1,7 @@
 #! /bin/bash
+if [ $2 == "clean" ]; then
+./cleanOSX.sh
+fi
 
 echo "Compiling YACReader"
 cd ./YACReader
diff --git a/releaseOSX.sh b/releaseOSX.sh
index f7479a71..91f6a7a0 100755
--- a/releaseOSX.sh
+++ b/releaseOSX.sh
@@ -3,6 +3,7 @@ macdeployqt YACReader.app
 macdeployqt YACReaderLibrary.app
 cp -R ./utils ./YACReader.app/Contents/MacOS/
 cp -R ./utils ./YACReaderLibrary.app/Contents/MacOS/
+cp -R ./release/server ./YACReaderLibrary.app/Contents/MacOS/
 cd ./YACReaderLibrary.app/Contents/MacOS/
 ln -s ../../../YACReader.app/Contents/MacOS/YACReader