From b0472d09ef365783ed505dc1ba82f54a2088eb8c Mon Sep 17 00:00:00 2001
From: falkTX <falktx@gmail.com>
Date: Tue, 16 Jul 2013 05:30:07 +0100
Subject: [PATCH] Misc fixing; XYController with scrollbar now

---
 c++/jackbridge/JackBridge.cpp                 |  7 ++-
 c++/jackmeter/Makefile                        |  4 +-
 c++/xycontroller/Makefile                     |  4 +-
 .../unzipfx-catarina/unzipfx/appDetails.h     |  2 +-
 .../unzipfx-catia/unzipfx/appDetails.h        |  2 +-
 resources/ui/xycontroller.ui                  | 43 ++++++++-----------
 6 files changed, 29 insertions(+), 33 deletions(-)

diff --git a/c++/jackbridge/JackBridge.cpp b/c++/jackbridge/JackBridge.cpp
index 8f51631..de644a1 100644
--- a/c++/jackbridge/JackBridge.cpp
+++ b/c++/jackbridge/JackBridge.cpp
@@ -339,14 +339,17 @@ const char* jackbridge_get_version_string()
 jack_client_t* jackbridge_client_open(const char* client_name, jack_options_t options, jack_status_t* status, ...)
 {
 #if JACKBRIDGE_DUMMY
-    return nullptr;
 #elif JACKBRIDGE_DIRECT
     return jack_client_open(client_name, options, status);
 #else
     if (bridge.client_open_ptr != nullptr)
         return bridge.client_open_ptr(client_name, options, status);
-    return nullptr;
 #endif
+
+    if (status != nullptr)
+        *status = JackServerError;
+
+    return nullptr;
 }
 
 const char* jackbridge_client_rename(jack_client_t* client, const char* new_name)
diff --git a/c++/jackmeter/Makefile b/c++/jackmeter/Makefile
index 51121f6..ede9178 100644
--- a/c++/jackmeter/Makefile
+++ b/c++/jackmeter/Makefile
@@ -9,8 +9,8 @@ include ../Makefile.mk
 # --------------------------------------------------------------
 
 BUILD_CXX_FLAGS += -I../widgets
-BUILD_CXX_FLAGS += $(shell pkg-config --cflags QtCore QtGui jack)
-LINK_FLAGS      += $(shell pkg-config --libs QtCore QtGui jack)
+BUILD_CXX_FLAGS += $(shell pkg-config --cflags QtCore QtGui)
+LINK_FLAGS      += $(shell pkg-config --libs QtCore QtGui)
 
 ifeq ($(HAVE_JACKSESSION),true)
 BUILD_CXX_FLAGS += -DHAVE_JACKSESSION
diff --git a/c++/xycontroller/Makefile b/c++/xycontroller/Makefile
index 03e1399..af57a05 100644
--- a/c++/xycontroller/Makefile
+++ b/c++/xycontroller/Makefile
@@ -9,8 +9,8 @@ include ../Makefile.mk
 # --------------------------------------------------------------
 
 BUILD_CXX_FLAGS += -I../widgets
-BUILD_CXX_FLAGS += $(shell pkg-config --cflags QtCore QtGui jack)
-LINK_FLAGS      += $(shell pkg-config --libs QtCore QtGui jack)
+BUILD_CXX_FLAGS += $(shell pkg-config --cflags QtCore QtGui)
+LINK_FLAGS      += $(shell pkg-config --libs QtCore QtGui)
 
 ifeq ($(HAVE_JACKSESSION),true)
 BUILD_CXX_FLAGS += -DHAVE_JACKSESSION
diff --git a/data/windows/unzipfx-catarina/unzipfx/appDetails.h b/data/windows/unzipfx-catarina/unzipfx/appDetails.h
index 823bd26..1bb3637 100644
--- a/data/windows/unzipfx-catarina/unzipfx/appDetails.h
+++ b/data/windows/unzipfx-catarina/unzipfx/appDetails.h
@@ -2,7 +2,7 @@
 #ifndef __APP_DETAILS_H__
 #define __APP_DETAILS_H__
 
-#define SFX_APP_VERSION "0.8.0"
+#define SFX_APP_VERSION "0.8.1"
 #define SFX_APP_BANNER  "Catarina self-contained executable " SFX_APP_VERSION ", based on UnZipSFX."
 
 #ifndef SFX_APP_MININAME
diff --git a/data/windows/unzipfx-catia/unzipfx/appDetails.h b/data/windows/unzipfx-catia/unzipfx/appDetails.h
index 5b0d301..d89c069 100644
--- a/data/windows/unzipfx-catia/unzipfx/appDetails.h
+++ b/data/windows/unzipfx-catia/unzipfx/appDetails.h
@@ -2,7 +2,7 @@
 #ifndef __APP_DETAILS_H__
 #define __APP_DETAILS_H__
 
-#define SFX_APP_VERSION "0.8.0"
+#define SFX_APP_VERSION "0.8.1"
 #define SFX_APP_BANNER  "Catia self-contained executable " SFX_APP_VERSION ", based on UnZipSFX."
 
 #ifndef SFX_APP_MININAME
diff --git a/resources/ui/xycontroller.ui b/resources/ui/xycontroller.ui
index fd6e4c9..25de099 100644
--- a/resources/ui/xycontroller.ui
+++ b/resources/ui/xycontroller.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>588</width>
-    <height>498</height>
+    <height>523</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -143,25 +143,16 @@
     <item>
      <widget class="QScrollArea" name="scrollArea">
       <property name="sizePolicy">
-       <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+       <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
         <horstretch>0</horstretch>
         <verstretch>0</verstretch>
        </sizepolicy>
       </property>
-      <property name="minimumSize">
-       <size>
-        <width>0</width>
-        <height>70</height>
-       </size>
-      </property>
       <property name="verticalScrollBarPolicy">
        <enum>Qt::ScrollBarAlwaysOff</enum>
       </property>
       <property name="horizontalScrollBarPolicy">
-       <enum>Qt::ScrollBarAlwaysOff</enum>
-      </property>
-      <property name="widgetResizable">
-       <bool>true</bool>
+       <enum>Qt::ScrollBarAlwaysOn</enum>
       </property>
       <property name="alignment">
        <set>Qt::AlignCenter</set>
@@ -170,30 +161,33 @@
        <property name="geometry">
         <rect>
          <x>0</x>
-         <y>0</y>
-         <width>864</width>
-         <height>64</height>
+         <y>10</y>
+         <width>1440</width>
+         <height>69</height>
         </rect>
        </property>
        <property name="sizePolicy">
-        <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
        <property name="minimumSize">
         <size>
-         <width>864</width>
-         <height>64</height>
+         <width>1440</width>
+         <height>69</height>
         </size>
        </property>
        <property name="maximumSize">
         <size>
-         <width>864</width>
-         <height>64</height>
+         <width>1440</width>
+         <height>69</height>
         </size>
        </property>
        <layout class="QHBoxLayout" name="horizontalLayout_2">
+        <property name="spacing">
+         <number>0</number>
+        </property>
         <property name="margin">
          <number>0</number>
         </property>
@@ -207,17 +201,16 @@
           </property>
           <property name="minimumSize">
            <size>
-            <width>864</width>
-            <height>64</height>
+            <width>1440</width>
+            <height>69</height>
            </size>
           </property>
           <property name="maximumSize">
            <size>
-            <width>864</width>
-            <height>64</height>
+            <width>1440</width>
+            <height>69</height>
            </size>
           </property>
-          <layout class="QHBoxLayout" name="horizontalLayout_4"/>
          </widget>
         </item>
        </layout>