qtstalker-svn-commits — notification of cvs commits

[Qtstalker-svn-commits] SF.net SVN: qtstalker:[16] trunk/plugins

[<sst...@us...>]

Revision: 16
          http://qtstalker.svn.sourceforge.net/qtstalker/?rev=16&view=rev
Author:   sstratos
Date:     2013-02-26 03:04:33 +0000 (Tue, 26 Feb 2013)
Log Message:
-----------
fixed plugins/Scanner plugins/YahooHistory vtable compile errors

Modified Paths:
--------------
    trunk/plugins/Scanner/ScannerWidget.cpp
    trunk/plugins/Scanner/ScannerWidget.h
    trunk/plugins/SymbolButton/SymbolButtonObject.cpp
    trunk/plugins/SymbolButton/SymbolButtonObject.h
    trunk/plugins/SymbolButton/SymbolButtonWidget.cpp
    trunk/plugins/SymbolButton/SymbolButtonWidget.h
    trunk/plugins/SymbolSelect/SymbolSelectObject.cpp
    trunk/plugins/SymbolSelect/SymbolSelectObject.h
    trunk/plugins/YahooHistory/YahooHistory.pro

Modified: trunk/plugins/Scanner/ScannerWidget.cpp
===================================================================
--- trunk/plugins/Scanner/ScannerWidget.cpp	2013-02-26 00:22:07 UTC (rev 15)
+++ trunk/plugins/Scanner/ScannerWidget.cpp	2013-02-26 03:04:33 UTC (rev 16)
@@ -29,10 +29,7 @@
 #include "Util.h"
 
 #include "../../pics/stop.xpm"
-#include "../../pics/help.xpm"
-#include "../../pics/quit.xpm"
 #include "../../pics/search.xpm"
-#include "../../pics/add.xpm"
 #include "../../pics/delete.xpm"
 #include "../../pics/edit.xpm"
 #include "../../pics/new.xpm"
@@ -67,10 +64,10 @@
   _indicatorPath = tl.join("/");
 
   Util util;
-  _symbolObject = util.object(QString("Symbol"), QString(), QString());
-  if (_symbolObject)
-    connect(_symbolObject, SIGNAL(signalMessage(ObjectCommand)), this, SLOT(symbolObjectMessage(ObjectCommand)));
-
+  _symbolButton = util.object(QString("SymbolButton"), _profile, QString("symbol_button"));
+  if (_symbolButton)
+    connect(_symbolButton, SIGNAL(signalMessage(ObjectCommand)), this, SLOT(buttonStatus()));
+  
   _rangeButton = util.object(QString("DateRangeButton"), _profile, QString());
 
   _barLengthButton = util.object(QString("BarLengthButton"), _profile, QString());
@@ -80,20 +77,19 @@
   loadSettings();
 
   indicatorItemClicked(0, 0);
-  symbolItemClicked(0);
 }
 
 ScannerWidget::~ScannerWidget ()
 {
-  if (_symbolObject)
-    delete _symbolObject;
-  
   if (_rangeButton)
     delete _rangeButton;
   
   if (_barLengthButton)
     delete _barLengthButton;
   
+  if (_symbolButton)
+    delete _symbolButton;
+  
   qDeleteAll(_objects);
 }
 
@@ -113,18 +109,6 @@
   connect(a, SIGNAL(triggered(bool)), this, SIGNAL(signalStop()));
   _actions.insert(_STOP, a);
   
-  a = new QAction(QIcon(help_xpm), tr("Help"), this);
-  a->setToolTip(tr("Help"));
-  a->setStatusTip(tr("Help"));
-  connect(a, SIGNAL(triggered(bool)), this, SLOT(help()));
-  _actions.insert(_HELP, a);
-  
-  a = new QAction(QIcon(quit_xpm), tr("Quit"), this);
-  a->setToolTip(tr("Quit"));
-  a->setStatusTip(tr("Quit"));
-  connect(a, SIGNAL(triggered(bool)), qApp, SLOT(quit()));
-  _actions.insert(_QUIT, a);
-  
   a = new QAction(QIcon(new_xpm), tr("New Indicator"), this);
   a->setToolTip(tr("New Indicator"));
   a->setStatusTip(tr("New Indicator"));
@@ -143,18 +127,6 @@
   connect(a, SIGNAL(triggered(bool)), this, SLOT(removeIndicator()));
   _actions.insert(_INDICATOR_REMOVE, a);
   
-  a = new QAction(QIcon(add_xpm), tr("Add Symbols"), this);
-  a->setToolTip(tr("Add Symbols"));
-  a->setStatusTip(tr("Add Symbols"));
-  connect(a, SIGNAL(triggered(bool)), this, SLOT(addSymbols()));
-  _actions.insert(_SYMBOL_ADD, a);
-  
-  a = new QAction(QIcon(delete_xpm), tr("Remove Symbols"), this);
-  a->setToolTip(tr("Remove Symbols"));
-  a->setStatusTip(tr("Remove Symbols"));
-  connect(a, SIGNAL(triggered(bool)), this, SLOT(removeSymbols()));
-  _actions.insert(_SYMBOL_REMOVE, a);
-  
   a = new QAction(QIcon(save_xpm), tr("Save Results As Group"), this);
   a->setToolTip(tr("Save Results As Group"));
   a->setStatusTip(tr("Save Results As Group"));
@@ -172,10 +144,15 @@
   vbox->setMargin(10);
   setLayout(vbox);
   
+  QSplitter *splitter = new QSplitter;
+  splitter->setOrientation(Qt::Vertical);
+  vbox->addWidget(splitter);
+  
   // indicator area
   QGroupBox *gbox = new QGroupBox;
   gbox->setTitle(tr("Indicators"));
-  vbox->addWidget(gbox);
+//  vbox->addWidget(gbox);
+  splitter->addWidget(gbox);
   
   QHBoxLayout *hbox = new QHBoxLayout;
   hbox->setSpacing(0);
@@ -198,59 +175,34 @@
   tb->addAction(_actions.value(_INDICATOR_REMOVE));
   hbox->addWidget(tb);
   
-  // symbols
-  hbox = new QHBoxLayout;
-  hbox->setSpacing(2);
-  hbox->setMargin(0);
-  vbox->addLayout(hbox);
- 
-  gbox = new QGroupBox;
-  gbox->setTitle(tr("Scan Symbols"));
-  hbox->addWidget(gbox);
-  
-  QHBoxLayout *thbox = new QHBoxLayout;
-  thbox->setSpacing(0);
-  thbox->setMargin(5);
-  gbox->setLayout(thbox);
-  
-  _symbols = new QListWidget;
-  connect(_symbols, SIGNAL(itemClicked(QListWidgetItem *)), this, SLOT(symbolItemClicked(QListWidgetItem *)));
-  thbox->addWidget(_symbols);
-
-  // toolbar
-  tb = new QToolBar;
-  tb->setOrientation(Qt::Vertical);
-  tb->addAction(_actions.value(_SYMBOL_ADD));
-  tb->addAction(_actions.value(_SYMBOL_REMOVE));
-  tb->addSeparator();
-  if (_barLengthButton)
-    tb->addWidget(_barLengthButton->widget());
-  if (_rangeButton)
-    tb->addWidget(_rangeButton->widget());
-  thbox->addWidget(tb);
-  
   // results
   gbox = new QGroupBox;
   gbox->setTitle(tr("Results"));
-  hbox->addWidget(gbox);
+//  vbox->addWidget(gbox);
+  splitter->addWidget(gbox);
   
-  thbox = new QHBoxLayout;
-  thbox->setSpacing(0);
-  thbox->setMargin(5);
-  gbox->setLayout(thbox);
+  hbox = new QHBoxLayout;
+  hbox->setSpacing(0);
+  hbox->setMargin(5);
+  gbox->setLayout(hbox);
   
   _results = new QListWidget;
-  thbox->addWidget(_results);
+  hbox->addWidget(_results);
   
   // toolbar
   tb = new QToolBar;
   tb->setOrientation(Qt::Vertical);
+  if (_symbolButton)
+    tb->addWidget(_symbolButton->widget());
+  if (_barLengthButton)
+    tb->addWidget(_barLengthButton->widget());
+  if (_rangeButton)
+    tb->addWidget(_rangeButton->widget());
+  tb->addSeparator();
   tb->addAction(_actions.value(_SCAN));
   tb->addAction(_actions.value(_STOP));
-  tb->addSeparator();
-  tb->addAction(_actions.value(_HELP));
-  tb->addAction(_actions.value(_QUIT));
-  thbox->addWidget(tb);
+  tb->addAction(_actions.value(_RESULT_SAVE_GROUP));
+  hbox->addWidget(tb);
   
   // statusbar
   _statusBar = _mw->statusBar();
@@ -276,7 +228,6 @@
   QPoint p = settings->value(QString("pos"), QPoint(0, 0)).toPoint();
   _mw->move(p);
   
-  _symbols->addItems(settings->value(QString("symbols")).toStringList());
   _results->addItems(settings->value(QString("results")).toStringList());
   
   // indicator column sizes
@@ -304,6 +255,13 @@
     toc.setValue(QString("QSettings"), (void *) settings);
     _barLengthButton->message(&toc);
   }
+
+  if (_symbolButton)
+  {
+    ObjectCommand toc(QString("load"));
+    toc.setValue(QString("QSettings"), (void *) settings);
+    _symbolButton->message(&toc);
+  }
   
   delete settings;
 }
@@ -315,14 +273,8 @@
   settings->setValue(QString("size"), _mw->size());
   settings->setValue(QString("pos"), _mw->pos());
   
-  // symbols
-  QStringList tl;
-  for (int pos = 0; pos < _symbols->count(); pos++)
-    tl << _symbols->item(pos)->text();
-  settings->setValue(QString("symbols"), tl);
-  
   // results
-  tl.clear();
+  QStringList tl;
   for (int pos = 0; pos < _results->count(); pos++)
     tl << _results->item(pos)->text();
   settings->setValue(QString("results"), tl);
@@ -344,6 +296,13 @@
     toc.setValue(QString("QSettings"), (void *) settings);
     _barLengthButton->message(&toc);
   }
+
+  if (_symbolButton)
+  {
+    ObjectCommand toc(QString("save"));
+    toc.setValue(QString("QSettings"), (void *) settings);
+    _symbolButton->message(&toc);
+  }
   
   delete settings;
   
@@ -394,13 +353,7 @@
   
   buttonStatus();
 
-  QStringList tl;
-  for (int pos = 0; pos < _symbols->count(); pos++)
-    tl << _symbols->item(pos)->text();
-
   saveIndicatorSettings();
-  
-  _progBar->setRange(0, tl.size());
 
   QDateTime sd, ed;
   if (_rangeButton)
@@ -429,7 +382,22 @@
     length = toc.getString(QString("length"));
   }
   
-  ScannerThread *thread = new ScannerThread(0, _profile, tl, length, sd, ed);
+  QStringList symbols;
+  if (_symbolButton)
+  {
+    ObjectCommand toc(QString("symbols"));
+    if (! _symbolButton->message(&toc))
+    {
+      done();
+      return;
+    }
+    
+    symbols = toc.getList(QString("symbols"));
+  }
+  
+  _progBar->setRange(0, symbols.size());
+  
+  ScannerThread *thread = new ScannerThread(0, _profile, symbols, length, sd, ed);
   connect(thread, SIGNAL(signalMessage(ObjectCommand)), this, SLOT(threadMessage(ObjectCommand)));
   connect(this, SIGNAL(signalStop()), thread, SLOT(stop()));
   connect(thread, SIGNAL(signalDone()), this, SLOT(done()));
@@ -444,23 +412,26 @@
   {
     _actions.value(_SCAN)->setEnabled(FALSE);
     _actions.value(_STOP)->setEnabled(TRUE);
-    _actions.value(_HELP)->setEnabled(FALSE);
-    _actions.value(_QUIT)->setEnabled(FALSE);
     return;
   }
   else
   {
     _actions.value(_STOP)->setEnabled(FALSE);
-    _actions.value(_HELP)->setEnabled(TRUE);
-    _actions.value(_QUIT)->setEnabled(TRUE);
   }
   
   int count = 0;
   if (_indicators->topLevelItemCount())
     count++;
-  if (_symbols->count())
-    count++;
   
+  if (_symbolButton)
+  {
+    ObjectCommand toc(QString("size"));
+    _symbolButton->message(&toc);
+    int size = toc.getInt(QString("size"));
+    if (size)
+      count++;
+  }
+  
   switch (count)
   {
     case 2:
@@ -641,54 +612,6 @@
 }
 
 void
-ScannerWidget::symbolItemClicked (QListWidgetItem *i)
-{
-  bool status = FALSE;
-  if (i)
-    status = TRUE;
-  
-  _actions.value(_SYMBOL_REMOVE)->setEnabled(status);
-  
-  buttonStatus();
-}
-
-void
-ScannerWidget::addSymbols ()
-{
-  if (! _symbolObject)
-    return;
-  
-  ObjectCommand toc(QString("search_dialog"));
-  _symbolObject->message(&toc);
-}
-
-void
-ScannerWidget::symbolObjectMessage (ObjectCommand oc)
-{
-  if (oc.command() != QString("search"))
-    return;
-
-  _symbols->clear();
-  
-  QHashIterator<QString, Data> it(oc.getDatas());
-  while (it.hasNext())
-  {
-    it.next();
-    _symbols->addItem(it.key());
-  }
-
-  buttonStatus();
-}
-
-void
-ScannerWidget::removeSymbols ()
-{
-  QList<QListWidgetItem *> il = _symbols->selectedItems();
-  qDeleteAll(il);
-  symbolItemClicked(0);
-}
-
-void
 ScannerWidget::saveResults ()
 {
   bool ok;
@@ -738,5 +661,18 @@
     }
   }
   
-  group->setName(name);
+  toc.setCommand(QString("remove"));
+  group->message(&toc);
+  
+  QStringList sl;
+  for (int pos = 0; pos < _results->count(); pos++)
+  {
+    QListWidgetItem *i = _results->item(pos);
+    sl << i->text();
+  }
+  toc.setCommand(QString("add"));
+  toc.setValue(QString("group"), name);
+  toc.setValue(QString("list"), sl);
+  group->message(&toc);
+  delete group;
 }

Modified: trunk/plugins/Scanner/ScannerWidget.h
===================================================================
--- trunk/plugins/Scanner/ScannerWidget.h	2013-02-26 00:22:07 UTC (rev 15)
+++ trunk/plugins/Scanner/ScannerWidget.h	2013-02-26 03:04:33 UTC (rev 16)
@@ -39,13 +39,9 @@
       _INDICATOR_EDIT,
       _INDICATOR_NEW,
       _INDICATOR_REMOVE,
-      _HELP,
-      _QUIT,
       _RESULT_SAVE_GROUP,
       _SCAN,
-      _STOP,
-      _SYMBOL_ADD,
-      _SYMBOL_REMOVE
+      _STOP
     };
     
     ScannerWidget (QMainWindow *, QString profile);
@@ -62,23 +58,18 @@
     void help ();
     void done ();
     void threadMessage (ObjectCommand);
-    void symbolObjectMessage (ObjectCommand);
     void newIndicator ();
     void editIndicator ();
     void removeIndicator ();
-    void addSymbols ();
-    void removeSymbols ();
     void saveSettings ();
     void saveResults ();
     
     void indicatorItemClicked (QTreeWidgetItem *, int);
-    void indicatorItemDoubleClicked (QTreeWidgetItem *, int);
-    void symbolItemClicked (QListWidgetItem *);
+//    void indicatorItemDoubleClicked (QTreeWidgetItem *, int);
     
   private:
-    Object *_symbolObject;
+    Object *_symbolButton;
     QTreeWidget *_indicators;
-    QListWidget *_symbols;
     QListWidget *_results;
     QProgressBar *_progBar;
     QToolBar *_toolBar;

Modified: trunk/plugins/SymbolButton/SymbolButtonObject.cpp
===================================================================
--- trunk/plugins/SymbolButton/SymbolButtonObject.cpp	2013-02-26 00:22:07 UTC (rev 15)
+++ trunk/plugins/SymbolButton/SymbolButtonObject.cpp	2013-02-26 03:04:33 UTC (rev 16)
@@ -37,6 +37,7 @@
   _commandList << QString("load");
   _commandList << QString("save");
   _commandList << QString("set_symbols");
+  _commandList << QString("size");
 }
 
 SymbolButtonObject::~SymbolButtonObject ()
@@ -67,6 +68,9 @@
     case 3:
       rc = setSymbols(oc);
       break;
+    case 4:
+      rc = size(oc);
+      break;
     default:
       break;
   }
@@ -167,3 +171,17 @@
   
   return 1;
 }
+
+int
+SymbolButtonObject::size (ObjectCommand *oc)
+{
+  if (! _widget)
+  {
+    qDebug() << "SymbolButtonObject::size: invalid widget";
+    return 0;
+  }
+  
+  oc->setValue(QString("size"), _widget->count());
+  
+  return 1;
+}

Modified: trunk/plugins/SymbolButton/SymbolButtonObject.h
===================================================================
--- trunk/plugins/SymbolButton/SymbolButtonObject.h	2013-02-26 00:22:07 UTC (rev 15)
+++ trunk/plugins/SymbolButton/SymbolButtonObject.h	2013-02-26 03:04:33 UTC (rev 16)
@@ -39,6 +39,7 @@
     int load (ObjectCommand *);
     int save (ObjectCommand *);
     int setSymbols (ObjectCommand *);
+    int size (ObjectCommand *);
     QWidget * widget ();
     
   public slots:    

Modified: trunk/plugins/SymbolButton/SymbolButtonWidget.cpp
===================================================================
--- trunk/plugins/SymbolButton/SymbolButtonWidget.cpp	2013-02-26 00:22:07 UTC (rev 15)
+++ trunk/plugins/SymbolButton/SymbolButtonWidget.cpp	2013-02-26 03:04:33 UTC (rev 16)
@@ -21,6 +21,7 @@
 
 #include "SymbolButtonWidget.h"
 #include "Util.h"
+#include "../pics/chart.xpm"
 
 #include <QDebug>
 
@@ -33,6 +34,8 @@
   
   connect(this, SIGNAL(clicked()), this, SLOT(symbolDialog()));
   
+  setIcon(QIcon(chart_xpm));
+  
   updateButtonText();
 }
 
@@ -84,16 +87,19 @@
   if (! _dialog)
     return;
   
-  ObjectCommand toc(QString("settings"));
-  _dialog->message(&toc);
-  
-  QStringList sl = toc.getList(QString("symbols"));
-  
-  QString ts = QString::number(sl.size());
-  
   QStringList tl;
-  tl << ts << tr("symbols selected");
+  tl << QString::number(count()) << tr("symbols selected");
   setToolTip(tl.join(" "));
+}
+
+int
+SymbolButtonWidget::count ()
+{
+  if (! _dialog)
+    return 0;
   
-  setText(ts);
+  ObjectCommand toc(QString("size"));
+  _dialog->message(&toc);
+  
+  return toc.getInt(QString("size"));
 }

Modified: trunk/plugins/SymbolButton/SymbolButtonWidget.h
===================================================================
--- trunk/plugins/SymbolButton/SymbolButtonWidget.h	2013-02-26 00:22:07 UTC (rev 15)
+++ trunk/plugins/SymbolButton/SymbolButtonWidget.h	2013-02-26 03:04:33 UTC (rev 16)
@@ -38,6 +38,7 @@
     SymbolButtonWidget ();
     ~SymbolButtonWidget ();
     QStringList symbols ();
+    int count ();
 
   public slots:
     void symbolDialog ();

Modified: trunk/plugins/SymbolSelect/SymbolSelectObject.cpp
===================================================================
--- trunk/plugins/SymbolSelect/SymbolSelectObject.cpp	2013-02-26 00:22:07 UTC (rev 15)
+++ trunk/plugins/SymbolSelect/SymbolSelectObject.cpp	2013-02-26 03:04:33 UTC (rev 16)
@@ -42,6 +42,7 @@
   _commandList << QString("save");
   _commandList << QString("set_settings");
   _commandList << QString("settings");
+  _commandList << QString("size");
 }
 
 SymbolSelectObject::~SymbolSelectObject ()
@@ -70,6 +71,9 @@
     case 4:
       rc = settings(oc);
       break;
+    case 5:
+      rc = size(oc);
+      break;
     default:
       break;
   }
@@ -165,3 +169,10 @@
   ObjectCommand toc(QString("symbols_changed"));
   emit signalMessage(toc);
 }
+
+int
+SymbolSelectObject::size (ObjectCommand *oc)
+{
+  oc->setValue(QString("size"), _symbols.size());
+  return 1;
+}

Modified: trunk/plugins/SymbolSelect/SymbolSelectObject.h
===================================================================
--- trunk/plugins/SymbolSelect/SymbolSelectObject.h	2013-02-26 00:22:07 UTC (rev 15)
+++ trunk/plugins/SymbolSelect/SymbolSelectObject.h	2013-02-26 03:04:33 UTC (rev 16)
@@ -39,6 +39,7 @@
     int save (ObjectCommand *);
     int setSettings (ObjectCommand *);
     int settings (ObjectCommand *);
+    int size (ObjectCommand *);
     
   public slots:    
     int message (ObjectCommand *);

Modified: trunk/plugins/YahooHistory/YahooHistory.pro
===================================================================
--- trunk/plugins/YahooHistory/YahooHistory.pro	2013-02-26 00:22:07 UTC (rev 15)
+++ trunk/plugins/YahooHistory/YahooHistory.pro	2013-02-26 03:04:33 UTC (rev 16)
@@ -19,7 +19,6 @@
 HEADERS += ../../src/ObjectCommand.h
 HEADERS += ../../src/Plugin.h
 
-OBJECTS += ../../src/build/Dialog.o
 OBJECTS += ../../src/build/Object.o
 OBJECTS += ../../src/build/ObjectCommand.o
 OBJECTS += ../../src/build/Util.o

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Qtstalker-svn-commits] SF.net SVN: qtstalker:[14] trunk/plugins

[<sst...@us...>]

Revision: 14
          http://qtstalker.svn.sourceforge.net/qtstalker/?rev=14&view=rev
Author:   sstratos
Date:     2013-02-25 23:58:32 +0000 (Mon, 25 Feb 2013)
Log Message:
-----------
fixed IndicatorPlot groups display

Modified Paths:
--------------
    trunk/plugins/Group/GroupObject.cpp
    trunk/plugins/Group/GroupObject.h
    trunk/plugins/IndicatorPlot/GroupPage.cpp
    trunk/plugins/SymbolSelect/SymbolSelectDialog.cpp

Modified: trunk/plugins/Group/GroupObject.cpp
===================================================================
--- trunk/plugins/Group/GroupObject.cpp	2013-02-25 22:12:45 UTC (rev 13)
+++ trunk/plugins/Group/GroupObject.cpp	2013-02-25 23:58:32 UTC (rev 14)
@@ -43,12 +43,19 @@
   QDir dir(QDir::homePath());
   tl << dir.absolutePath() << QString("OTA") << QString("Group") << QString("db") << QString("groups");
   _file = tl.join("/");
+
+  Util util;
+  _dialog = util.object(QString("SymbolSelect"), QString(), QString());
+  if (_dialog)
+    connect(_dialog, SIGNAL(signalMessage(ObjectCommand)), this, SLOT(dialogMessage(ObjectCommand)));
   
   load();
 }
 
 GroupObject::~GroupObject ()
 {
+  if (_dialog)
+    delete _dialog;
 }
 
 int
@@ -87,32 +94,8 @@
     return 0;
   
   QSettings settings(_file, QSettings::NativeFormat);
+  _symbols = settings.value(_name).toStringList();
   
-  QStringList symbols = settings.value(_name).toStringList();
-  if (! symbols.size())
-    return 1;
-  
-  Util util;
-  Object *db = util.object(QString("Symbol"), QString(), QString());
-  if (! db)
-  {
-    qDebug() << "GroupObject::load: invalid Symbol";
-    return 0;
-  }
-  
-  ObjectCommand toc(QString("info"));
-  toc.setValue(QString("names"), symbols);
-  if (! db->message(&toc))
-  {
-    qDebug() << "GroupObject::load: message error" << db->plugin() << toc.command();
-    delete db;
-    return 0;
-  }
-  else
-    delete db;
-
-  _symbols = toc.getDatas();
-
   return 1;
 }
 
@@ -123,17 +106,7 @@
     return 0;
   
   QSettings settings(_file, QSettings::NativeFormat);
-  
-  QStringList tl;
-  QHashIterator<QString, Data> it(_symbols);
-  while (it.hasNext())
-  {
-    it.next();
-    tl << it.key();
-  }
-  
-  settings.setValue(_name, tl);
-  
+  settings.setValue(_name, _symbols);
   settings.sync();
 
   return 1;
@@ -167,32 +140,47 @@
 {
   if (_name.isEmpty())
     return 0;
+
+  if (! _dialog)
+    return 0;
   
-  GroupDialog *d = new GroupDialog(_name);
-  d->setSettings(_symbols);
-  connect(d, SIGNAL(signalDone(void *)), this, SLOT(dialogDone(void *)));
-  d->setModified(FALSE);
-  d->show();
+  ObjectCommand toc(QString("settings"));
+  _dialog->message(&toc);
+  
+  toc.setValue(QString("symbols"), _symbols);
+  
+  toc.setCommand(QString("set_settings"));
+  _dialog->message(&toc);
+  
+  toc.setCommand(QString("dialog"));
+  _dialog->message(&toc);
+
   return 1;
 }
 
 void
-GroupObject::dialogDone (void *dialog)
+GroupObject::dialogMessage (ObjectCommand oc)
 {
-  GroupDialog *d = (GroupDialog *) dialog;
-  d->settings(_symbols);
+  if (oc.command() != QString("symbols_changed"))
+    return;
+  
+  ObjectCommand toc(QString("settings"));
+  _dialog->message(&toc);
+  
+  _symbols = toc.getList(QString("symbols"));
+  
   save();
   
-  ObjectCommand toc(QString("modified"));
-  toc.setValue(QString("group"), _name);
-  toc.setDatas(_symbols);
-  emit signalMessage(toc);
+  ObjectCommand moc(QString("modified"));
+  moc.setValue(QString("group"), _name);
+  moc.setValue(QString("symbols"), _symbols);
+  emit signalMessage(moc);
 }
 
 int
 GroupObject::symbols (ObjectCommand *oc)
 {
-  oc->setDatas(_symbols);
+  oc->setValue(QString("symbols"), _symbols);
   return 1;
 }
 
@@ -211,34 +199,9 @@
   load();
   
   key = QString("list");
-  QStringList tl = oc->getList(key);
+  _symbols << oc->getList(key);
+  _symbols.removeDuplicates();
 
-  Util util;
-  Object *db = util.object(QString("Symbol"), QString(), QString());
-  if (! db)
-  {
-    qDebug() << "GroupObject::add: invalid Symbol object";
-    return 0;
-  }
-  
-  ObjectCommand toc(QString("info"));
-  toc.setValue(QString("names"), tl);
-  if (! db->message(&toc))
-  {
-    qDebug() << "GroupObject::load: message error" << db->plugin() << toc.command();
-    delete db;
-    return 0;
-  }
-  else
-    delete db;
-
-  QHashIterator<QString, Data> it(toc.getDatas());
-  while (it.hasNext())
-  {
-    it.next();
-    _symbols.insert(it.key(), it.value());
-  }
-  
   save();
   
   return 1;

Modified: trunk/plugins/Group/GroupObject.h
===================================================================
--- trunk/plugins/Group/GroupObject.h	2013-02-25 22:12:45 UTC (rev 13)
+++ trunk/plugins/Group/GroupObject.h	2013-02-25 23:58:32 UTC (rev 14)
@@ -45,12 +45,13 @@
     
   public slots:    
     int message (ObjectCommand *);
-    void dialogDone (void *);
+    void dialogMessage (ObjectCommand);
     
   private:
+    Object *_dialog;
     QStringList _commandList;
     QString _file;
-    QHash<QString, Data> _symbols;
+    QStringList _symbols;
 };
 
 #endif

Modified: trunk/plugins/IndicatorPlot/GroupPage.cpp
===================================================================
--- trunk/plugins/IndicatorPlot/GroupPage.cpp	2013-02-25 22:12:45 UTC (rev 13)
+++ trunk/plugins/IndicatorPlot/GroupPage.cpp	2013-02-25 23:58:32 UTC (rev 14)
@@ -242,6 +242,10 @@
     delete o;
   
   QStringList groups = toc.getList(key);
+
+  Object *db = util.object(QString("Symbol"), QString(), QString());
+  if (! db)
+    return;
   
   for (int pos = 0; pos < groups.size(); pos++)
   {
@@ -261,6 +265,12 @@
       continue;
     }
 
+    QStringList tl = toc.getList(QString("symbols"));
+    
+    toc.setCommand(QString("info"));
+    toc.setValue(QString("names"), tl);
+    db->message(&toc);
+    
     QHashIterator<QString, Data> it(toc.getDatas());
     while (it.hasNext())
     {
@@ -276,6 +286,8 @@
     _groups.insert(groups.at(pos), group);
   }
 
+  delete db;
+  
   selectionChanged();
 }
 
@@ -342,17 +354,29 @@
   
   p->takeChildren();
   
-  QHashIterator<QString, Data> it(oc.getDatas());
+  QStringList sl = oc.getList(QString("symbols"));
+  
+  Util util;
+  Object *db = util.object(QString("Symbol"), QString(), QString());
+  if (! db)
+    return;
+  
+  ObjectCommand toc(QString("info"));
+  toc.setValue(QString("names"), sl);
+  db->message(&toc);
+  
+  QHashIterator<QString, Data> it(toc.getDatas());
   while (it.hasNext())
   {
     it.next();
     Data d = it.value();
-    
+  
     QTreeWidgetItem *i = new QTreeWidgetItem(p);
     i->setText(1, it.key());
     i->setToolTip(1, d.value(QString("name")).toString());
   }
   
+  delete db;
+  
   selectionChanged();
 }
-

Modified: trunk/plugins/SymbolSelect/SymbolSelectDialog.cpp
===================================================================
--- trunk/plugins/SymbolSelect/SymbolSelectDialog.cpp	2013-02-25 22:12:45 UTC (rev 13)
+++ trunk/plugins/SymbolSelect/SymbolSelectDialog.cpp	2013-02-25 23:58:32 UTC (rev 14)
@@ -152,7 +152,7 @@
   l << tr("Symbol") << tr("Name");
 
   _searchList = new QTreeWidget;
-  _searchList->setSortingEnabled(FALSE);
+  _searchList->setSortingEnabled(TRUE);
   _searchList->setRootIsDecorated(FALSE);
   _searchList->setHeaderLabels(l);
   _searchList->setSelectionMode(QAbstractItemView::ExtendedSelection);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.