parent
d2bdfc967e
commit
26ef72c201
|
@ -1292,9 +1292,9 @@ void MainWindow::Open()
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
/**
|
/**
|
||||||
* @brief Options config dialog.
|
* @brief Preferences config dialog.
|
||||||
*/
|
*/
|
||||||
void MainWindow::Options()
|
void MainWindow::Preferences()
|
||||||
{
|
{
|
||||||
ConfigDialog dlg(this);
|
ConfigDialog dlg(this);
|
||||||
if (dlg.exec() == QDialog::Accepted)
|
if (dlg.exec() == QDialog::Accepted)
|
||||||
|
@ -1701,11 +1701,11 @@ void MainWindow::CreateMenus()
|
||||||
{
|
{
|
||||||
for (int i = 0; i < MaxRecentFiles; ++i)
|
for (int i = 0; i < MaxRecentFiles; ++i)
|
||||||
{
|
{
|
||||||
ui->menuFile->insertAction(ui->actionExit, recentFileActs[i]);
|
ui->menuFile->insertAction(ui->actionPreferences, recentFileActs[i]);
|
||||||
}
|
}
|
||||||
separatorAct = new QAction(this);
|
separatorAct = new QAction(this);
|
||||||
separatorAct->setSeparator(true);
|
separatorAct->setSeparator(true);
|
||||||
ui->menuFile->insertAction(ui->actionExit, separatorAct);
|
ui->menuFile->insertAction(ui->actionPreferences, separatorAct);
|
||||||
UpdateRecentFileActions();
|
UpdateRecentFileActions();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1727,7 +1727,7 @@ void MainWindow::CreateActions()
|
||||||
connect(ui->actionAbout_Qt, &QAction::triggered, this, &MainWindow::AboutQt);
|
connect(ui->actionAbout_Qt, &QAction::triggered, this, &MainWindow::AboutQt);
|
||||||
connect(ui->actionAbout_Valentina, &QAction::triggered, this, &MainWindow::About);
|
connect(ui->actionAbout_Valentina, &QAction::triggered, this, &MainWindow::About);
|
||||||
connect(ui->actionExit, &QAction::triggered, this, &MainWindow::close);
|
connect(ui->actionExit, &QAction::triggered, this, &MainWindow::close);
|
||||||
connect(ui->actionOptions, &QAction::triggered, this, &MainWindow::Options);
|
connect(ui->actionPreferences, &QAction::triggered, this, &MainWindow::Preferences);
|
||||||
connect(ui->actionPattern_properties, &QAction::triggered, this, &MainWindow::PatternProperties);
|
connect(ui->actionPattern_properties, &QAction::triggered, this, &MainWindow::PatternProperties);
|
||||||
ui->actionPattern_properties->setEnabled(false);
|
ui->actionPattern_properties->setEnabled(false);
|
||||||
|
|
||||||
|
|
|
@ -72,7 +72,7 @@ public slots:
|
||||||
bool SaveAs();
|
bool SaveAs();
|
||||||
bool Save();
|
bool Save();
|
||||||
void Open();
|
void Open();
|
||||||
void Options();
|
void Preferences();
|
||||||
void NewPattern();
|
void NewPattern();
|
||||||
|
|
||||||
void currentDrawChanged( int index );
|
void currentDrawChanged( int index );
|
||||||
|
|
|
@ -47,7 +47,7 @@
|
||||||
<rect>
|
<rect>
|
||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>144</width>
|
<width>150</width>
|
||||||
<height>150</height>
|
<height>150</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
|
@ -302,7 +302,7 @@
|
||||||
<rect>
|
<rect>
|
||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>100</width>
|
<width>150</width>
|
||||||
<height>58</height>
|
<height>58</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
|
@ -378,7 +378,7 @@
|
||||||
<rect>
|
<rect>
|
||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>100</width>
|
<width>150</width>
|
||||||
<height>104</height>
|
<height>104</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
|
@ -579,7 +579,7 @@
|
||||||
<rect>
|
<rect>
|
||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>100</width>
|
<width>150</width>
|
||||||
<height>58</height>
|
<height>58</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
|
@ -676,6 +676,8 @@
|
||||||
<addaction name="actionSave"/>
|
<addaction name="actionSave"/>
|
||||||
<addaction name="actionSaveAs"/>
|
<addaction name="actionSaveAs"/>
|
||||||
<addaction name="separator"/>
|
<addaction name="separator"/>
|
||||||
|
<addaction name="actionPreferences"/>
|
||||||
|
<addaction name="separator"/>
|
||||||
<addaction name="actionExit"/>
|
<addaction name="actionExit"/>
|
||||||
</widget>
|
</widget>
|
||||||
<widget class="QMenu" name="menuHelp">
|
<widget class="QMenu" name="menuHelp">
|
||||||
|
@ -697,7 +699,6 @@
|
||||||
<addaction name="actionZoomOut"/>
|
<addaction name="actionZoomOut"/>
|
||||||
<addaction name="separator"/>
|
<addaction name="separator"/>
|
||||||
<addaction name="actionPattern_properties"/>
|
<addaction name="actionPattern_properties"/>
|
||||||
<addaction name="actionOptions"/>
|
|
||||||
</widget>
|
</widget>
|
||||||
<widget class="QMenu" name="menuMeasurements">
|
<widget class="QMenu" name="menuMeasurements">
|
||||||
<property name="title">
|
<property name="title">
|
||||||
|
@ -1013,9 +1014,9 @@
|
||||||
<string>Ctrl+Q</string>
|
<string>Ctrl+Q</string>
|
||||||
</property>
|
</property>
|
||||||
</action>
|
</action>
|
||||||
<action name="actionOptions">
|
<action name="actionPreferences">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Options...</string>
|
<string>Preferences</string>
|
||||||
</property>
|
</property>
|
||||||
</action>
|
</action>
|
||||||
<action name="actionPattern_properties">
|
<action name="actionPattern_properties">
|
||||||
|
|
Loading…
Reference in New Issue
Block a user