Diff
Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/fsgui/appmanager.cpp (14779 => 14780)
--- freeswitch/trunk/contrib/jmesquita/fsgui/src/fsgui/appmanager.cpp 2009-09-07 22:13:09 UTC (rev 14779)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/fsgui/appmanager.cpp 2009-09-07 23:08:57 UTC (rev 14780)
@@ -137,7 +137,6 @@
pluginsDir->setCurrent(dir);
#else
dir = settings.value("PluginDir", qApp->applicationDirPath()).toString();
- qDebug() << qApp->applicationDirPath();
pluginsDir->setCurrent(dir);
pluginsDir->cd("plugins");
#endif
Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/servermanager.cpp (14779 => 14780)
--- freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/servermanager.cpp 2009-09-07 22:13:09 UTC (rev 14779)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/servermanager.cpp 2009-09-07 23:08:57 UTC (rev 14780)
@@ -133,6 +133,7 @@
settings.endGroup();
readSettings();
m_ui->listServers->setCurrentItem(m_ui->listServers->findItems(text, Qt::MatchExactly, 0).first());
+ m_ui->btnEdit->click();
}
}
@@ -144,6 +145,7 @@
m_ui->btnSave->setEnabled(true);
m_ui->btnEdit->setEnabled(false);
m_ui->lineHost->setFocus();
+ m_ui->btnConnect->setEnabled(false);
}
void ServerManager::saveServer()
@@ -167,6 +169,7 @@
m_ui->linePort->setEnabled(false);
m_ui->btnSave->setEnabled(false);
m_ui->btnEdit->setEnabled(true);
+ m_ui->btnConnect->setEnabled(true);
}
void ServerManager::deleteServer()
@@ -197,4 +200,3 @@
}
settings.endGroup();
}
-
Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/servermanager.ui (14779 => 14780)
--- freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/servermanager.ui 2009-09-07 22:13:09 UTC (rev 14779)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/servermanager.ui 2009-09-07 23:08:57 UTC (rev 14780)
@@ -38,7 +38,7 @@
<string>&Add server</string>
</property>
<property name="icon">
- <iconset>
+ <iconset resource="../resources/resources.qrc">
<normaloff>:/icons/new_server_icon.png</normaloff>:/icons/new_server_icon.png</iconset>
</property>
</widget>
@@ -49,7 +49,7 @@
<string>&Remove Server</string>
</property>
<property name="icon">
- <iconset>
+ <iconset resource="../resources/resources.qrc">
<normaloff>:/icons/remove_server_icon.png</normaloff>:/icons/remove_server_icon.png</iconset>
</property>
</widget>
@@ -66,7 +66,7 @@
<bool>true</bool>
</property>
<property name="currentIndex">
- <number>1</number>
+ <number>0</number>
</property>
<widget class="QWidget" name="tabBasic">
<attribute name="title">
@@ -144,7 +144,7 @@
<string>&Save</string>
</property>
<property name="icon">
- <iconset>
+ <iconset resource="../resources/resources.qrc">
<normaloff>:/icons/save.png</normaloff>:/icons/save.png</iconset>
</property>
<property name="iconSize">
@@ -164,7 +164,7 @@
<string>&Edit</string>
</property>
<property name="icon">
- <iconset>
+ <iconset resource="../resources/resources.qrc">
<normaloff>:/icons/edit_icon.png</normaloff>:/icons/edit_icon.png</iconset>
</property>
<property name="iconSize">
@@ -224,7 +224,7 @@
<string>&Connect</string>
</property>
<property name="icon">
- <iconset>
+ <iconset resource="../resources/resources.qrc">
<normaloff>:/icons/connect_icon.png</normaloff>:/icons/connect_icon.png</iconset>
</property>
<property name="iconSize">
@@ -243,7 +243,11 @@
</layout>
<zorder></zorder>
</widget>
- <resources/>
+ <resources>
+ <include location="../resources/resources.qrc"/>
+ <include location="../resources/resources.qrc"/>
+ <include location="../resources/resources.qrc"/>
+ </resources>
<connections>
<connection>
<sender>pushButton_5</sender>
Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoletabwidget.cpp (14779 => 14780)
--- freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoletabwidget.cpp 2009-09-07 22:13:09 UTC (rev 14779)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoletabwidget.cpp 2009-09-07 23:08:57 UTC (rev 14780)
@@ -19,10 +19,10 @@
model->setSourceModel(sourceModel);
model->setFilterKeyColumn(0);
m_ui->consoleListView->setModel(model);
+ m_ui->consoleListView->setColumnWidth(0, 2000);
QObject::connect(sourceModel, SIGNAL(beforeInserting()),
this, SLOT(setConditionalScroll()));
-
QObject::connect(sourceModel, SIGNAL(afterInserting()),
this, SLOT(conditionalScroll()));
Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoletabwidget.ui (14779 => 14780)
--- freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoletabwidget.ui 2009-09-07 22:13:09 UTC (rev 14779)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoletabwidget.ui 2009-09-07 23:08:57 UTC (rev 14780)
@@ -306,9 +306,15 @@
</layout>
</widget>
<widget class="QTableView" name="consoleListView">
+ <property name="autoScroll">
+ <bool>false</bool>
+ </property>
<property name="editTriggers">
<set>QAbstractItemView::NoEditTriggers</set>
</property>
+ <property name="tabKeyNavigation">
+ <bool>false</bool>
+ </property>
<property name="showDropIndicator" stdset="0">
<bool>false</bool>
</property>
@@ -318,45 +324,48 @@
<property name="selectionMode">
<enum>QAbstractItemView::ExtendedSelection</enum>
</property>
+ <property name="horizontalScrollMode">
+ <enum>QAbstractItemView::ScrollPerPixel</enum>
+ </property>
<property name="showGrid">
<bool>false</bool>
</property>
+ <property name="wordWrap">
+ <bool>false</bool>
+ </property>
<property name="cornerButtonEnabled">
<bool>false</bool>
</property>
<attribute name="horizontalHeaderVisible">
<bool>false</bool>
</attribute>
- <attribute name="horizontalHeaderHighlightSections">
+ <attribute name="horizontalHeaderCascadingSectionResizes">
<bool>false</bool>
</attribute>
- <attribute name="horizontalHeaderStretchLastSection">
- <bool>true</bool>
- </attribute>
- <attribute name="verticalHeaderVisible">
+ <attribute name="horizontalHeaderHighlightSections">
<bool>false</bool>
</attribute>
- <attribute name="verticalHeaderHighlightSections">
+ <attribute name="horizontalHeaderShowSortIndicator" stdset="0">
<bool>false</bool>
</attribute>
- <attribute name="verticalHeaderStretchLastSection">
+ <attribute name="horizontalHeaderStretchLastSection">
<bool>false</bool>
</attribute>
<attribute name="verticalHeaderVisible">
<bool>false</bool>
</attribute>
- <attribute name="horizontalHeaderStretchLastSection">
- <bool>true</bool>
- </attribute>
- <attribute name="horizontalHeaderVisible">
+ <attribute name="verticalHeaderCascadingSectionResizes">
<bool>false</bool>
</attribute>
- <attribute name="horizontalHeaderHighlightSections">
- <bool>false</bool>
+ <attribute name="verticalHeaderDefaultSectionSize">
+ <number>20</number>
</attribute>
<attribute name="verticalHeaderHighlightSections">
<bool>false</bool>
</attribute>
+ <attribute name="verticalHeaderShowSortIndicator" stdset="0">
+ <bool>false</bool>
+ </attribute>
<attribute name="verticalHeaderStretchLastSection">
<bool>false</bool>
</attribute>
Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/realtimestatisticsdialog.cpp (14779 => 14780)
--- freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/realtimestatisticsdialog.cpp 2009-09-07 22:13:09 UTC (rev 14779)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/realtimestatisticsdialog.cpp 2009-09-07 23:08:57 UTC (rev 14780)
@@ -146,6 +146,7 @@
m_ui->listInactiveHeaders->clear();
Channel * ch = _sm->getInactiveChannel(index.data(Qt::UserRole).toString());
+ qDebug() << ch;
if (!ch)
return;
Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/sortfilterproxymodel.cpp (14779 => 14780)
--- freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/sortfilterproxymodel.cpp 2009-09-07 22:13:09 UTC (rev 14779)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/sortfilterproxymodel.cpp 2009-09-07 23:08:57 UTC (rev 14780)
@@ -2,7 +2,7 @@
#include "sortfilterproxymodel.h"
ConsoleModel::ConsoleModel (QObject *parent)
- : QAbstractListModel(parent)
+ : QAbstractTableModel(parent)
{
QSettings settings;
batchSize = settings.value("Console/batchSize", 200).toInt();
@@ -17,11 +17,15 @@
return _listDisplayModel.count();
}
+int ConsoleModel::columnCount ( const QModelIndex & /*parent*/ ) const
+{
+ return 1;
+}
+
QVariant ConsoleModel::data ( const QModelIndex & index, int role ) const
{
if (!index.isValid())
return QVariant();
-
return _listDisplayModel.at(index.row())->data(role);
}
Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/sortfilterproxymodel.h (14779 => 14780)
--- freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/sortfilterproxymodel.h 2009-09-07 22:13:09 UTC (rev 14779)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/sortfilterproxymodel.h 2009-09-07 23:08:57 UTC (rev 14780)
@@ -39,7 +39,7 @@
#define SORTFILTERPROXYMODEL_H
#include <QSortFilterProxyModel>
-#include <QAbstractListModel>
+#include <QAbstractTableModel>
#include <QVector>
#include <QList>
@@ -47,12 +47,13 @@
class QStandardItem;
class QScrollBar;
-class ConsoleModel : public QAbstractListModel
+class ConsoleModel : public QAbstractTableModel
{
Q_OBJECT
public:
ConsoleModel (QObject *parent = 0);
int rowCount ( const QModelIndex & parent = QModelIndex() ) const;
+ int columnCount ( const QModelIndex & parent = QModelIndex() ) const;
QVariant data ( const QModelIndex & index, int role = Qt::DisplayRole ) const;
void appendRow ( QStandardItem* item );
void clear();