Changed: Renamed configurations to profiles
--HG-- branch : feature-ryzom-installer
This commit is contained in:
parent
e38af28d40
commit
767ab0b83c
5 changed files with 34 additions and 25 deletions
code/ryzom/tools/client/ryzom_installer
|
@ -19,6 +19,7 @@
|
||||||
#include "downloader.h"
|
#include "downloader.h"
|
||||||
#include "archive.h"
|
#include "archive.h"
|
||||||
#include "wizarddialog.h"
|
#include "wizarddialog.h"
|
||||||
|
#include "profilesdialog.h"
|
||||||
#include "configfile.h"
|
#include "configfile.h"
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
|
||||||
|
@ -67,6 +68,8 @@ CMainWindow::CMainWindow():QMainWindow(), m_archive(NULL), m_statusLabel(NULL)
|
||||||
connect(m_archive, SIGNAL(extractSuccess(qint64)), SLOT(onExtractSuccess(qint64)));
|
connect(m_archive, SIGNAL(extractSuccess(qint64)), SLOT(onExtractSuccess(qint64)));
|
||||||
connect(m_archive, SIGNAL(extractFail(QString)), SLOT(onExtractFail(QString)));
|
connect(m_archive, SIGNAL(extractFail(QString)), SLOT(onExtractFail(QString)));
|
||||||
|
|
||||||
|
connect(actionProfiles, SIGNAL(triggered()), SLOT(onProfiles()));
|
||||||
|
|
||||||
connect(actionAboutQt, SIGNAL(triggered()), SLOT(onAboutQt()));
|
connect(actionAboutQt, SIGNAL(triggered()), SLOT(onAboutQt()));
|
||||||
connect(actionAbout, SIGNAL(triggered()), SLOT(onAbout()));
|
connect(actionAbout, SIGNAL(triggered()), SLOT(onAbout()));
|
||||||
|
|
||||||
|
@ -75,10 +78,6 @@ CMainWindow::CMainWindow():QMainWindow(), m_archive(NULL), m_statusLabel(NULL)
|
||||||
statusBar()->addWidget(m_statusLabel);
|
statusBar()->addWidget(m_statusLabel);
|
||||||
|
|
||||||
// setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Maximum);
|
// setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Maximum);
|
||||||
|
|
||||||
// processNextStep();
|
|
||||||
|
|
||||||
m_archive->extract("d:/Ryzom/bonjourx.7z", "");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
CMainWindow::~CMainWindow()
|
CMainWindow::~CMainWindow()
|
||||||
|
@ -175,6 +174,8 @@ void CMainWindow::showEvent(QShowEvent *e)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
e->accept();
|
e->accept();
|
||||||
|
|
||||||
|
processNextStep();
|
||||||
}
|
}
|
||||||
|
|
||||||
void CMainWindow::closeEvent(QCloseEvent *e)
|
void CMainWindow::closeEvent(QCloseEvent *e)
|
||||||
|
@ -208,6 +209,13 @@ void CMainWindow::onStopClicked()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void CMainWindow::onProfiles()
|
||||||
|
{
|
||||||
|
CProfilesDialog dialog;
|
||||||
|
|
||||||
|
dialog.exec();
|
||||||
|
}
|
||||||
|
|
||||||
void CMainWindow::onAbout()
|
void CMainWindow::onAbout()
|
||||||
{
|
{
|
||||||
QString br("<br>");
|
QString br("<br>");
|
||||||
|
|
|
@ -41,6 +41,7 @@ public slots:
|
||||||
void onResumeClicked();
|
void onResumeClicked();
|
||||||
void onStopClicked();
|
void onStopClicked();
|
||||||
|
|
||||||
|
void onProfiles();
|
||||||
void onAbout();
|
void onAbout();
|
||||||
void onAboutQt();
|
void onAboutQt();
|
||||||
|
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
|
|
||||||
#include "ui_profiles.h"
|
#include "ui_profiles.h"
|
||||||
|
|
||||||
class CProfilesDialog : public QDialog, public Ui::ConfigurationsDialog
|
class CProfilesDialog : public QDialog, public Ui::ProfilesDialog
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
|
|
|
@ -159,10 +159,10 @@ p, li { white-space: pre-wrap; }
|
||||||
<property name="title">
|
<property name="title">
|
||||||
<string>&Settings</string>
|
<string>&Settings</string>
|
||||||
</property>
|
</property>
|
||||||
<addaction name="action_Configurations"/>
|
<addaction name="actionProfiles"/>
|
||||||
<addaction name="action_Directories"/>
|
<addaction name="actionDirectories"/>
|
||||||
<addaction name="separator"/>
|
<addaction name="separator"/>
|
||||||
<addaction name="action_Quit"/>
|
<addaction name="actionQuit"/>
|
||||||
</widget>
|
</widget>
|
||||||
<widget class="QMenu" name="menu_Help">
|
<widget class="QMenu" name="menu_Help">
|
||||||
<property name="title">
|
<property name="title">
|
||||||
|
@ -189,17 +189,17 @@ p, li { white-space: pre-wrap; }
|
||||||
<string>About...</string>
|
<string>About...</string>
|
||||||
</property>
|
</property>
|
||||||
</action>
|
</action>
|
||||||
<action name="action_Configurations">
|
<action name="actionProfiles">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>&Configurations</string>
|
<string>&Profiles</string>
|
||||||
</property>
|
</property>
|
||||||
</action>
|
</action>
|
||||||
<action name="action_Directories">
|
<action name="actionDirectories">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>&Directories</string>
|
<string>&Directories</string>
|
||||||
</property>
|
</property>
|
||||||
</action>
|
</action>
|
||||||
<action name="action_Quit">
|
<action name="actionQuit">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>&Quit</string>
|
<string>&Quit</string>
|
||||||
</property>
|
</property>
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<ui version="4.0">
|
<ui version="4.0">
|
||||||
<class>ConfigurationsDialog</class>
|
<class>ProfilesDialog</class>
|
||||||
<widget class="QDialog" name="ConfigurationsDialog">
|
<widget class="QDialog" name="ProfilesDialog">
|
||||||
<property name="geometry">
|
<property name="geometry">
|
||||||
<rect>
|
<rect>
|
||||||
<x>0</x>
|
<x>0</x>
|
||||||
|
@ -17,16 +17,16 @@
|
||||||
<item>
|
<item>
|
||||||
<layout class="QHBoxLayout" name="mainLayout">
|
<layout class="QHBoxLayout" name="mainLayout">
|
||||||
<item>
|
<item>
|
||||||
<layout class="QVBoxLayout" name="configurationsLayout" stretch="0,1,0">
|
<layout class="QVBoxLayout" name="profilesLayout" stretch="0,1,0">
|
||||||
<item>
|
<item>
|
||||||
<widget class="QLabel" name="configurationsLabel">
|
<widget class="QLabel" name="profilesLabel">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>List of configurations:</string>
|
<string>List of profiles:</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QListView" name="configurationsListView">
|
<widget class="QListView" name="profilesListView">
|
||||||
<property name="sizePolicy">
|
<property name="sizePolicy">
|
||||||
<sizepolicy hsizetype="Ignored" vsizetype="Expanding">
|
<sizepolicy hsizetype="Ignored" vsizetype="Expanding">
|
||||||
<horstretch>0</horstretch>
|
<horstretch>0</horstretch>
|
||||||
|
@ -45,7 +45,7 @@
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<layout class="QHBoxLayout" name="configurationsActionsLayout" stretch="0,0">
|
<layout class="QHBoxLayout" name="profilesActionsLayout" stretch="0,0">
|
||||||
<item>
|
<item>
|
||||||
<widget class="QPushButton" name="addButton">
|
<widget class="QPushButton" name="addButton">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
|
@ -67,14 +67,14 @@
|
||||||
<item>
|
<item>
|
||||||
<layout class="QFormLayout" name="formLayout">
|
<layout class="QFormLayout" name="formLayout">
|
||||||
<item row="0" column="0">
|
<item row="0" column="0">
|
||||||
<widget class="QLabel" name="configurationLabel">
|
<widget class="QLabel" name="profileLabel">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Configuration:</string>
|
<string>Profile:</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="0" column="1">
|
<item row="0" column="1">
|
||||||
<widget class="QLabel" name="configurationIdLabel">
|
<widget class="QLabel" name="profileIdLabel">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>0</string>
|
<string>0</string>
|
||||||
</property>
|
</property>
|
||||||
|
@ -254,7 +254,7 @@
|
||||||
</layout>
|
</layout>
|
||||||
</widget>
|
</widget>
|
||||||
<tabstops>
|
<tabstops>
|
||||||
<tabstop>configurationsListView</tabstop>
|
<tabstop>profilesListView</tabstop>
|
||||||
<tabstop>addButton</tabstop>
|
<tabstop>addButton</tabstop>
|
||||||
<tabstop>deleteButton</tabstop>
|
<tabstop>deleteButton</tabstop>
|
||||||
<tabstop>accountEdit</tabstop>
|
<tabstop>accountEdit</tabstop>
|
||||||
|
@ -272,7 +272,7 @@
|
||||||
<connection>
|
<connection>
|
||||||
<sender>buttonBox</sender>
|
<sender>buttonBox</sender>
|
||||||
<signal>accepted()</signal>
|
<signal>accepted()</signal>
|
||||||
<receiver>ConfigurationsDialog</receiver>
|
<receiver>ProfilesDialog</receiver>
|
||||||
<slot>accept()</slot>
|
<slot>accept()</slot>
|
||||||
<hints>
|
<hints>
|
||||||
<hint type="sourcelabel">
|
<hint type="sourcelabel">
|
||||||
|
@ -288,7 +288,7 @@
|
||||||
<connection>
|
<connection>
|
||||||
<sender>buttonBox</sender>
|
<sender>buttonBox</sender>
|
||||||
<signal>rejected()</signal>
|
<signal>rejected()</signal>
|
||||||
<receiver>ConfigurationsDialog</receiver>
|
<receiver>ProfilesDialog</receiver>
|
||||||
<slot>reject()</slot>
|
<slot>reject()</slot>
|
||||||
<hints>
|
<hints>
|
||||||
<hint type="sourcelabel">
|
<hint type="sourcelabel">
|
||||||
|
|
Loading…
Reference in a new issue