IanniX 0.9.11

- Releasing
buzzinglight · Aug 13, 2013 · 5616faa · 5616faa
1 parent c96f98c
commit 5616faa
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 11 deletions.
diff --git a/IanniX.pro.user b/IanniX.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 2.7.1, 2013-08-11T15:16:51. -->
+<!-- Written by QtCreator 2.7.1, 2013-08-13T08:20:34. -->
 <qtcreator>
  <data>
   <variable>ProjectExplorer.Project.ActiveTarget</variable>

diff --git a/gui/uiinspector.cpp b/gui/uiinspector.cpp
@@ -451,11 +451,11 @@ void UiInspector::timerEvent(QTimerEvent *) {
 void UiInspector::refreshIp() {
     //IPs
     QStringList ipsName;
-    foreach(const QNetworkInterface &interface, QNetworkInterface::allInterfaces()) {
-        foreach(const QNetworkAddressEntry &addressEntry, interface.addressEntries()) {
+    foreach(const QNetworkInterface &interf, QNetworkInterface::allInterfaces()) {
+        foreach(const QNetworkAddressEntry &addressEntry, interf.addressEntries()) {
             bool ok = false;
             QString ipName;
-            if(addressEntry.ip().toIPv4Address() > 0)                    {  ipName += QString("     - %1 (%2)").arg(addressEntry.ip().toString()).arg(interface.humanReadableName()); ok = true; }
+            if(addressEntry.ip().toIPv4Address() > 0)                    {  ipName += QString("     - %1 (%2)").arg(addressEntry.ip().toString()).arg(interf.humanReadableName()); ok = true; }
             if((ok) && (addressEntry.broadcast().toIPv4Address() > 0))      ipName += QString(", broadcast on %1").arg(addressEntry.broadcast().toString());
             if(ok)                                                       {  ipsName << ipName; }
         }

diff --git a/iannix.cpp b/iannix.cpp
@@ -80,8 +80,8 @@ IanniX::IanniX(const QString &_projectToLoad, QObject *parent) :
     //Transport
     connect(transport, SIGNAL(forceOpenGLtimer(qreal)),             SLOT(forceOpenGLTimer(qreal)));
     connect(transport, SIGNAL(forceSchedulerTimer(qreal)),          SLOT(forceSchedulerTimer(qreal)));
-    connect(Transport::editor, SIGNAL(askSave()),    SLOT(actionSave()));
-    connect(Transport::editor, SIGNAL(askSave()),    SLOT(actionReloadScript()));
+    connect(Transport::editor, SIGNAL(askSave()),    SLOT(actionSaveAndReload()));
+    //connect(Transport::editor, SIGNAL(askSave()),    SLOT(actionReloadScript()));
     connect(Transport::editor, SIGNAL(askRefresh()), SLOT(actionRefresh()));
 
     //Inspector
@@ -595,6 +595,10 @@ void IanniX::actionOpen() {
 void IanniX::actionSave() {
     inspector->getFileWidget()->askSave();
 }
+void IanniX::actionSaveAndReload() {
+    inspector->getFileWidget()->askSave();
+    actionReloadScript();
+}
 void IanniX::actionSave_as() {
     inspector->getFileWidget()->askSave(true);
 }

diff --git a/iannix.h b/iannix.h
@@ -212,6 +212,7 @@ public slots:
     void actionNew();
     void actionOpen();
     void actionSave();
+    void actionSaveAndReload();
     void actionSave_as();
     void actionRefresh();
     void currentDocumentChanged(UiSyncItem*);

diff --git a/interfaces/interfaceosc.cpp b/interfaces/interfaceosc.cpp
@@ -159,10 +159,10 @@ void InterfaceOsc::bonjourScan() {
 
     //IPs
     QList<BonjourService> toAddServices;
-    foreach(const QNetworkInterface &interface, QNetworkInterface::allInterfaces()) {
-        foreach(const QNetworkAddressEntry &addressEntry, interface.addressEntries()) {
-            if(addressEntry.ip().toIPv4Address() > 0)           toAddServices.append(BonjourService(tr("Network %1 (my IP)").arg(interface.humanReadableName()), addressEntry.ip(), 0));
-            if(addressEntry.broadcast().toIPv4Address() > 0)    toAddServices.append(BonjourService(tr("Network %1 (broadcast)").arg(interface.humanReadableName()), addressEntry.broadcast(), 0));
+    foreach(const QNetworkInterface &interf, QNetworkInterface::allInterfaces()) {
+        foreach(const QNetworkAddressEntry &addressEntry, interf.addressEntries()) {
+            if(addressEntry.ip().toIPv4Address() > 0)           toAddServices.append(BonjourService(tr("Network %1 (my IP)").arg(interf.humanReadableName()), addressEntry.ip(), 0));
+            if(addressEntry.broadcast().toIPv4Address() > 0)    toAddServices.append(BonjourService(tr("Network %1 (broadcast)").arg(interf.humanReadableName()), addressEntry.broadcast(), 0));
         }
     }
     foreach(const BonjourService &toAddService, toAddServices) {

diff --git a/items/uitreeview.ui b/items/uitreeview.ui
@@ -119,7 +119,7 @@ QPushButton#actionDuplicate, QPushButton#actionAddRoot, QPushButton#actionSave {
         <string>Duplicate</string>
        </property>
        <property name="text">
-        <string>DUPLICATE</string>
+        <string>BACKUP</string>
        </property>
       </widget>
      </item>