WebSVN – tpanel – Diff – /trunk/tpageinterface.cpp

 #include <include/core/SkFontMetrics.h>
 #include <include/core/SkTextBlob.h>
 #include "tpageinterface.h"
 #include "tsystemsound.h"
+#include "tobject.h"
+#include "ttpinit.h"
 #include "tconfig.h"
 #include "tresources.h"
+#include "tpagemanager.h"
 #include "terror.h"
 using std::string;
 using std::vector;
+        }
         return vector<string>();
+    }
-    if (ap == 0 && (ta == 2024 || ta == 2025))  // System listbox: system sounds and system single beeps
+    if (ap == 0 && (ta == SYSTEM_LIST_SYSTEMSOUND || ta == SYSTEM_LIST_SINGLEBEEP)) // System listbox: system sounds and system single beeps
+    {
         vector<LIST_t>::iterator iter;
         for (iter = mLists.begin(); iter != mLists.end(); ++iter)
+        {
         list.list = tmpFiles;
         list.selected = getSystemSelection(ta, tmpFiles);
         mLists.push_back(list);
         return tmpFiles;
+    }
-    if (ap == 0 && ta == 2026)                  // System listbox: double beeps
+    else if (ap == 0 && ta == SYSTEM_LIST_DOUBLEBEEP)   // System listbox: double beeps
+    {
         vector<LIST_t>::iterator iter;
         for (iter = mLists.begin(); iter != mLists.end(); ++iter)
+        {
         list.list = tmpFiles;
         list.selected = getSystemSelection(ta, tmpFiles);
         mLists.push_back(list);
         return tmpFiles;
+    }
+    else if (ap == 0 && ta == SYSTEM_LIST_SURFACE)  // System listbox: TP4 file (surface file)
+    {
+        vector<LIST_t>::iterator iter;
+        for (iter = mLists.begin(); iter != mLists.end(); ++iter)
+        {
+            if (iter->handle == handle)
+            {
+                iter->ap = ap;
+                iter->ta = ta;
+                iter->ti = ti;
+                iter->rows = rows;
+                iter->columns = columns;
+                if (iter->selected < 0 && !iter->list.empty())
+                {
+                    int row = getSystemSelection(ta, iter->list);
+                    if (row > 0)
+                        iter->selected = row;
+                }
+                return iter->list;
+            }
+        }
+        // Load surface file names from NetLinx over FTP
+        TTPInit tt;
+        vector<TTPInit::FILELIST_t> fileList = tt.getFileList(".tp4");
+        vector<string> tmpFiles;
+        if (!fileList.empty())
+        {
+            vector<TTPInit::FILELIST_t>::iterator iter;
+            if (gPageManager)
+                gPageManager->clearFtpSurface();
+            for (iter = fileList.begin(); iter != fileList.end(); ++iter)
+            {
+                tmpFiles.push_back(iter->fname);
+                if (gPageManager)
+                    gPageManager->addFtpSurface(iter->fname, iter->size);
+            }
+        }
+        LIST_t list;
+        list.handle = handle;
+        list.ap = ap;
+        list.ta = ta;
+        list.ti = ti;
+        list.rows = rows;
+        list.columns = columns;
+        list.list = tmpFiles;
+        list.selected = getSystemSelection(ta, tmpFiles);
+        mLists.push_back(list);
+        return tmpFiles;
+    }
     return vector<string>();
+}
 int TPageInterface::getSystemSelection(int ta, vector<string>& list)
     DECL_TRACER("TPageInterface::setSystemSelection(int ta, vector<string>* list)");
     vector<string>::iterator iterSel;
     string sel;
-    if (ta == 1024)
+    if (ta == SYSTEM_LIST_SURFACE)
+        sel = TConfig::getFtpSurface();
+    if (ta == SYSTEM_LIST_SYSTEMSOUND)
         sel = TConfig::getSystemSound();
-    else if (ta == 1025)
+    else if (ta == SYSTEM_LIST_SINGLEBEEP)
         sel = TConfig::getSingleBeepSound();
-    else if (ta == 1026)
+    else if (ta == SYSTEM_LIST_DOUBLEBEEP)
         sel = TConfig::getDoubleBeepSound();
     else
         return -1;
     int row = 1;
     button->setFontOnly(sr[0].fi, 0);
     button->setTextColorOnly(sr[0].ct, 0);
     button->setTextEffectColorOnly(sr[0].ec, 0);
-    if (button->getListAp() == 0 && button->getListTi() >= 5000)
+    if (button->getListAp() == 0 && button->getListTi() >= SYSTEM_PAGE_START)
         button->setTextJustificationOnly(4, 0, 0, 0);
+}
 void TPageInterface::setSelectedRow(ulong handle, int row)
+{
         if (iter->handle == handle)
+        {
             if ((size_t)row <= iter->list.size())
                 iter->selected = row;
+            MSG_DEBUG("Row was set to " << row << " for item " << TObject::handleToString(handle));
             return;
+        }
+    }
+}
             ulong nPage = (handle >> 16) & 0x0000ffff;
             ulong nButt = handle & 0x0000ffff;
             string sel;
-            if (nPage == 5503 && nButt == 1)
+            if (nPage == SYSTEM_SUBPAGE_SURFACE && nButt == 1)
+                sel = TConfig::getFtpSurface();
+            if (nPage == SYSTEM_SUBPAGE_SYSTEMSOUND && nButt == 1)
                 sel = TConfig::getSystemSound();
-            else if (nPage == 5504 && nButt == 1)
+            else if (nPage == SYSTEM_SUBPAGE_SINGLEBEEP && nButt == 1)
                 sel = TConfig::getSingleBeepSound();
-            else if (nPage == 5505 && nButt == 1)
+            else if (nPage == SYSTEM_SUBPAGE_DOUBLEBEEP && nButt == 1)
                 sel = TConfig::getDoubleBeepSound();
             else
                 return string();
             if (iter->list.empty())

Subversion Repositories tpanel

(root)/trunk/tpageinterface.cpp @ 250 – Rev 205 → 206