retronetworking
/
yate
12
0
Fork 2
Code Issues Pull Requests Projects Releases Wiki Activity

Now a QT window remembers its old id when created with an alias in order to be able to retrieve its section in config. 

git-svn-id: http://yate.null.ro/svn/yate/trunk@2171 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
marian 2008-08-28 15:48:03 +00:00
parent 7ce3725b50
commit c91cbd37fb
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
clients/qt4/qt4client.cpp
View File

@ -523,12 +523,12 @@ QtWindow::QtWindow()
{
}
QtWindow::QtWindow(const char* name, const char* description)
: Window(name), m_description(description),
QtWindow::QtWindow(const char* name, const char* description, const char* alias)
: Window(alias ? alias : name), m_description(description), m_oldId(name),
m_x(0), m_y(0), m_width(0), m_height(0),
m_maximized(false), m_mainWindow(false)
{
setObjectName(qtSetUtf8(name));
setObjectName(qtSetUtf8(m_id));
setAccessibleName(qtSetUtf8(description));
}
@ -1393,7 +1393,7 @@ void QtWindow::setVisible(bool visible)
void QtWindow::show()
{
setVisible(true);
m_maximized = isMaximized();
m_maximized = m_maximized || isMaximized();
if (m_maximized)
setWindowState(Qt::WindowMaximized);
}
@ -1460,8 +1460,8 @@ void QtWindow::doInit()
setWindowFlags(Qt::FramelessWindowHint);
// Load window data
m_mainWindow = s_cfg.getBoolValue(m_id,"mainwindow");
m_saveOnClose = s_cfg.getBoolValue(m_id,"save",true);
m_mainWindow = s_cfg.getBoolValue(m_oldId,"mainwindow");
m_saveOnClose = s_cfg.getBoolValue(m_oldId,"save",true);
NamedList* sect = s_save.getSection(m_id);
if (sect) {
m_maximized = sect->getBoolValue("maximized");
@ -1474,7 +1474,7 @@ void QtWindow::doInit()
else {
Debug(QtDriver::self(),DebugNote,"Window(%s) not found in config [%p]",
m_id.c_str(),this);
m_visible = s_cfg.getBoolValue(m_id,"visible");
m_visible = s_cfg.getBoolValue(m_oldId,"visible");
}
m_visible = m_mainWindow || m_visible;
@ -1723,20 +1723,21 @@ void QtClient::allHidden()
bool QtClient::createWindow(const String& name, const String& alias)
{
String wName = alias ? alias : name;
QtWindow* w = new QtWindow(wName,s_skinPath + s_cfg.getValue(name,"description"));
QtWindow* w = new QtWindow(name,s_skinPath + s_cfg.getValue(name,"description"),alias);
if (w) {
Debug(QtDriver::self(),DebugAll,"Created window %s (%p)",wName.c_str(),w);
Debug(QtDriver::self(),DebugAll,"Created window name=%s alias=%s (%p)",
name.c_str(),alias.c_str(),w);
// Remove the old window
ObjList* o = m_windows.find(wName);
ObjList* o = m_windows.find(w->id());
if (o)
Client::self()->closeWindow(wName,false);
Client::self()->closeWindow(w->id(),false);
w->populate();
m_windows.append(w);
return true;
}
else
Debug(QtDriver::self(),DebugGoOn,"Could not create window %s",wName.c_str());
Debug(QtDriver::self(),DebugGoOn,"Could not create window name=%s alias=%s",
name.c_str(),alias.c_str());
return false;
}

3
clients/qt4/qt4client.h
View File

@ -204,7 +204,7 @@ class YQT4_API QtWindow : public QWidget, public Window
friend class QtClient;
public:
QtWindow();
QtWindow(const char* name, const char* description);
QtWindow(const char* name, const char* description, const char* alias);
virtual ~QtWindow();
virtual void title(const String& text);
@ -348,6 +348,7 @@ protected:
{ return findChild<QWidget*>(m_widget); }
String m_description;
String m_oldId; // Old id used to retreive the config section in .rc
bool m_keysVisible;
int m_x;
int m_y;