Merge branch 'osx-fixes'

RedisInsight · Oct 22, 2013 · 6dd2c55 · 6dd2c55
2 parents 750a372 + 676ee83
commit 6dd2c55
Show file tree

Hide file tree

Showing 17 changed files with 195 additions and 82 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,18 +1,21 @@
-language: cpp
+language: objective-c
 compiler:
-  - gcc
+- clang
 before_install:
-- sudo add-apt-repository --yes ppa:ubuntu-sdk-team/ppa
-- sudo apt-get update -qq
-- sudo apt-get install ubuntu-sdk -y -qq
-- sudo apt-get install libssl1.0.0 -y -qq
+- brew update
+- brew install qt5
+- brew link qt5 --force
+- brew install libpng
+- brew link libpng --force
+- brew install openssl
+- brew install libssh2
+- brew install redis
 before_script:
+- redis-server --daemonize yes
 - cd ./redis-desktop-manager
-- sudo chmod 777 configure
-- ./configure
 script: 
-  - qmake -qt=qt5 -v
-  - qmake -qt=qt5
+  - qmake -v
+  - qmake 
   - make clean
   - make -s
   - cd ./../tests/
@@ -27,4 +30,4 @@ notifications:
     - [email protected]
   email:
     on_success: change
-    on_failure: always
+    on_failure: always
diff --git a/README.md b/README.md
@@ -1,13 +1,15 @@
 [Redis Desktop Manager](http://redisdesktop.com "Redis Desktop Manager Offical Site")
 ===================
-[![Build Status](https://travis-ci.org/uglide/RedisDesktopManager.png?branch=master)](https://travis-ci.org/uglide/RedisDesktopManager)
+Ubuntu: [![Build Status](https://travis-ci.org/uglide/RedisDesktopManager.png?branch=master)](https://travis-ci.org/uglide/RedisDesktopManager) 
+Mac OS X: [![Build Status](https://travis-ci.org/uglide/RedisDesktopManager.png?branch=osx)](https://travis-ci.org/uglide/RedisDesktopManager)
 
 Open source cross-platform Redis Desktop Manager based on Qt 5
 
 
 **Supported platforms**
 
-- Windows Xp, Vista, 7, 8
+- Windows Xp, Vista, 7, 8
+- Mac OS X 10.8, 10.9
 - Ubuntu 12 and 13
 - Debian 7
 
@@ -19,6 +21,10 @@ Open source cross-platform Redis Desktop Manager based on Qt 5
 1. Download Windows Installer from [http://redisdesktop.com/download](http://redisdesktop.com/download)
 2. Run downloaded installer
 
+### Mac OS X ###
+1. Download dmg image from [http://redisdesktop.com/download](http://redisdesktop.com/download)
+2. Mount dmg image
+3. Run rdm.app
 
 ### Ubuntu & Debian ###
 
@@ -32,10 +38,11 @@ Open source cross-platform Redis Desktop Manager based on Qt 5
 
 After installation Redis Desktop Manager will be available in main menu.
 
-### Other Linux & Mac OS  ###
+### Other Linux ###
 You can build Redis Desktop Manager from source.
 
-1. Install Qt 5.1.1
+1. Install Qt 5.1.1
+2. Install openssl 1.0
 2. Run:
 	`./configure && qmake redis-desktop-manager.pro && make`
 

diff --git a/Vagrantfile b/Vagrantfile
@@ -27,11 +27,18 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     debi6.vm.provision :shell, :path => "install_ubuntu.sh"
   end 
 
-  #debian 7
-  config.vm.define "debi7" do |debi7|
-    debi7.vm.box = "debi7"
+  #debian 7 x64
+  config.vm.define "debi7" do |debi7|32
+    debi7.vm.box = "debi7_i386"
     debi7.vm.box_url = "https://s3-eu-west-1.amazonaws.com/ffuenf-vagrant-boxes/debian/debian-7.1.0-amd64.box"
     debi7.vm.provision :shell, :path => "install_debi7.sh"
   end 
 
+  #debian 7 x86
+  config.vm.define "debi7_32" do |debi7_32|
+    debi7_32.vm.box = "debi7_i386"
+    debi7_32.vm.box_url = "http://redisdesktop.com/vagrant/debi7_i386.box"
+    debi7_32.vm.provision :shell, :path => "install_debi7.sh"
+  end 
+
 end
diff --git a/build_osxbundle.sh b/build_osxbundle.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+BUILD_DIR=./bin/linux/release/rdm.app/Contents/
+
+cp -f ./redis-desktop-manager/Info.plist $BUILD_DIR/Info.plist
+cp -f ./redis-desktop-manager/rdm.icns $BUILD_DIR/Resources/rdm.icns 
diff --git a/build_package.sh b/build_package.sh
@@ -21,8 +21,8 @@ echo ===========================
 echo copy source dir :
 
 BUILD_DIR=$HOME_DIR/redis-desktop-manager-$TAG
-rm -fR $BUILD_DIR
-rm -f $HOME_DIR/redis-desktop*
+rm -fR $BUILD_DIR/*
+rm -fR $HOME_DIR/redis-desktop*
 mkdir $BUILD_DIR
 
 cp -Rf /vagrant/redis-desktop-manager/* $BUILD_DIR

diff --git a/install_debi7.sh b/install_debi7.sh
@@ -1,17 +1,17 @@
 #!/bin/sh
 
-#sudo apt-get update 
-#sudo apt-get install git python perl -y
-#sudo apt-get install libssl0.9.8 -y
-#sudo apt-get install "^libxcb.*" libx11-xcb-dev libglu1-mesa-dev libxrender-dev -y 
-#sudo apt-get install libatspi-dev -y
-#sudo apt-get install libdbus-1-dev -y
-#sudo apt-get install libxext-dev -y
-#sudo apt-get install g++ -y
+sudo apt-get update 
+sudo apt-get install git python perl -y
+sudo apt-get install libssl-dev -y
+sudo apt-get install "^libxcb.*" libx11-xcb-dev libglu1-mesa-dev libxrender-dev -y 
+sudo apt-get install libatspi-dev -y
+sudo apt-get install libdbus-1-dev -y
+sudo apt-get install libxext-dev -y
+sudo apt-get install g++ -y
 
 #setup build env
-#sudo apt-get install build-essential devscripts ubuntu-dev-tools debhelper \
-#        dh-make diff patch gnupg fakeroot lintian pbuilder -y
+sudo apt-get install build-essential devscripts ubuntu-dev-tools debhelper \
+        dh-make diffutils patch gnupg fakeroot lintian pbuilder -y
 
 cd /home/vagrant
 
@@ -36,7 +36,7 @@ fi
 
 cd ./qt-everywhere-opensource-src-5.1.1
 
-sudo ./configure -opensource -qt-libpng -qt-libjpeg -qt-xcb -qt-xkbcommon -no-kms -no-opengl -dbus-linked -openssl-linked -nomake examples -no-javascript-jit -nomake tests -confirm-license
+sudo ./configure -opensource -qt-libpng -qt-libjpeg -qt-xcb -qt-xkbcommon -no-kms -no-opengl -dbus-linked -openssl-linked -nomake examples -no-javascript-jit -nomake tests -v -confirm-license
 
 sudo make
 sudo make install

diff --git a/redis-desktop-manager/Info.plist b/redis-desktop-manager/Info.plist
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
+<plist version="0.9">
+<dict>
+        <key>CFBundleIconFile</key>
+        <string>rdm.icns</string>
+        <key>NSPrincipalClass</key>
+        <string>NSApplication</string>
+        <key>CFBundleIconFile</key>
+        <string></string>
+        <key>CFBundlePackageType</key>
+        <string>APPL</string>
+        <key>CFBundleGetInfoString</key>
+        <string>Created by Qt/QMake</string>
+        <key>CFBundleSignature</key>
+        <string>????</string>
+        <key>CFBundleExecutable</key>
+        <string>RedisDesktopManager</string>
+        <key>CFBundleIdentifier</key>
+        <string>com.redisdesktop.rdm</string>
+        <key>NOTE</key>
+        <string>This file was generated by Qt/QMake.</string>
+</dict>
+</plist>
diff --git a/redis-desktop-manager/Resources/demo.qrc b/redis-desktop-manager/Resources/demo.qrc
@@ -16,5 +16,6 @@
       <file alias="refreshdb.png">../images/refreshdb.png</file>
       <file alias="editdb.png">../images/editdb.png</file>
       <file alias="delete.png">../images/delete.png</file>
+      <file alias="rdm.ico">../Resources/redis.ico</file>
     </qresource>
 </RCC>
diff --git a/redis-desktop-manager/forms/connection.ui b/redis-desktop-manager/forms/connection.ui
@@ -29,7 +29,7 @@
    <enum>Qt::DefaultContextMenu</enum>
   </property>
   <property name="windowTitle">
-   <string>Add Connection</string>
+   <string>Connection</string>
   </property>
   <property name="modal">
    <bool>true</bool>
@@ -261,6 +261,20 @@
    </widget>
   </widget>
  </widget>
+ <tabstops>
+  <tabstop>nameEdit</tabstop>
+  <tabstop>hostEdit</tabstop>
+  <tabstop>portSpinBox</tabstop>
+  <tabstop>authEdit</tabstop>
+  <tabstop>okButton</tabstop>
+  <tabstop>cancelButton</tabstop>
+  <tabstop>useSshTunnel</tabstop>
+  <tabstop>sshHost</tabstop>
+  <tabstop>sshPort</tabstop>
+  <tabstop>sshUser</tabstop>
+  <tabstop>sshPass</tabstop>
+  <tabstop>tabs</tabstop>
+ </tabstops>
  <resources/>
  <connections>
   <connection>

diff --git a/redis-desktop-manager/forms/demo.ui b/redis-desktop-manager/forms/demo.ui
@@ -133,7 +133,7 @@ aa|bb 	Either aa or bb.
            <widget class="QPushButton" name="pbClearFilter">
             <property name="maximumSize">
              <size>
-              <width>50</width>
+              <width>60</width>
               <height>16777215</height>
              </size>
             </property>
@@ -195,6 +195,12 @@ aa|bb 	Either aa or bb.
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
+          <property name="minimumSize">
+           <size>
+            <width>0</width>
+            <height>40</height>
+           </size>
+          </property>
           <property name="maximumSize">
            <size>
             <width>300</width>
@@ -215,6 +221,12 @@ aa|bb 	Either aa or bb.
         </item>
         <item>
          <widget class="QPushButton" name="pbImportConnections">
+          <property name="minimumSize">
+           <size>
+            <width>0</width>
+            <height>40</height>
+           </size>
+          </property>
           <property name="maximumSize">
            <size>
             <width>300</width>
@@ -241,7 +253,7 @@ aa|bb 	Either aa or bb.
        </property>
        <property name="minimumSize">
         <size>
-         <width>550</width>
+         <width>580</width>
          <height>0</height>
         </size>
        </property>
@@ -306,7 +318,7 @@ aa|bb 	Either aa or bb.
            </property>
            <property name="minimumSize">
             <size>
-             <width>560</width>
+             <width>580</width>
              <height>240</height>
             </size>
            </property>
@@ -362,8 +374,8 @@ aa|bb 	Either aa or bb.
            <widget class="QLabel" name="currentVersionLabel">
             <property name="geometry">
              <rect>
-              <x>400</x>
-              <y>100</y>
+              <x>170</x>
+              <y>130</y>
               <width>171</width>
               <height>41</height>
              </rect>
@@ -395,7 +407,7 @@ aa|bb 	Either aa or bb.
             </property>
             <property name="text">
              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;
-&lt;style&gt;a {color: #808080; text-decoration: none}&lt;/style&gt;
+&lt;style&gt;a {color: #808080; text-decoration: none; font-size: 10px}&lt;/style&gt;
 &lt;p&gt;&lt;span style=&quot; font-size:10px; font-weight:600;&quot;&gt;Third Party Libs and Images:&lt;/span&gt;&lt;a href=&quot;http://qt-project.org/&quot;&gt; QT (GPL License)&lt;/a&gt;; &lt;a href=&quot;http://libqxt.org/&quot;&gt;Qxt (GPL License)&lt;/a&gt; , &lt;a href=&quot;http://www.libssh2.org&quot;&gt;libssh2 (BSD License)&lt;/a&gt;, &lt;a href=&quot;http://www.carlosprioglio.com/&quot;&gt;Redis Logo&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
             </property>
             <property name="scaledContents">
@@ -412,7 +424,7 @@ aa|bb 	Either aa or bb.
             <property name="geometry">
              <rect>
               <x>20</x>
-              <y>130</y>
+              <y>150</y>
               <width>511</width>
               <height>21</height>
              </rect>

diff --git a/redis-desktop-manager/rdm.icns b/redis-desktop-manager/rdm.icns