tycho: add close button
parent
840ac231d3
commit
3c42cd451d
|
@ -33,7 +33,7 @@ protected:
|
||||||
private:
|
private:
|
||||||
ProjectView *activeProject() const;
|
ProjectView *activeProject() const;
|
||||||
QMdiSubWindow *activeSubWindow() const;
|
QMdiSubWindow *activeSubWindow() const;
|
||||||
void addProject(ProjectView *proj);
|
void addProject(ProjectView *view);
|
||||||
|
|
||||||
QSharedPointer<Ui::Menu> ui;
|
QSharedPointer<Ui::Menu> ui;
|
||||||
};
|
};
|
||||||
|
|
|
@ -17,11 +17,12 @@ Menu::Menu(QWidget *parent) :
|
||||||
{
|
{
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
|
|
||||||
ui->actionOpen->setShortcut(QKeySequence(QKeySequence::Open));
|
|
||||||
ui->actionNew->setShortcut(QKeySequence(QKeySequence::New));
|
|
||||||
ui->actionQuit->setShortcut(QKeySequence(QKeySequence::Quit));
|
|
||||||
ui->actionAbout->setShortcut(QKeySequence(QKeySequence::HelpContents));
|
ui->actionAbout->setShortcut(QKeySequence(QKeySequence::HelpContents));
|
||||||
|
ui->actionClose->setShortcut(QKeySequence(QKeySequence::Close));
|
||||||
ui->actionMapProps->setShortcut(QKeySequence(tr("Ctrl+P")));
|
ui->actionMapProps->setShortcut(QKeySequence(tr("Ctrl+P")));
|
||||||
|
ui->actionNew->setShortcut(QKeySequence(QKeySequence::New));
|
||||||
|
ui->actionOpen->setShortcut(QKeySequence(QKeySequence::Open));
|
||||||
|
ui->actionQuit->setShortcut(QKeySequence(QKeySequence::Quit));
|
||||||
|
|
||||||
dbgPrintFunc();
|
dbgPrintFunc();
|
||||||
}
|
}
|
||||||
|
@ -110,6 +111,7 @@ void Menu::updateActions()
|
||||||
auto view = activeProject();
|
auto view = activeProject();
|
||||||
bool active = view != nullptr;
|
bool active = view != nullptr;
|
||||||
|
|
||||||
|
ui->actionClose->setEnabled(active);
|
||||||
ui->actionMapProps->setEnabled(active);
|
ui->actionMapProps->setEnabled(active);
|
||||||
|
|
||||||
dbgPrintFunc();
|
dbgPrintFunc();
|
||||||
|
|
|
@ -61,6 +61,8 @@
|
||||||
<addaction name="actionNew"/>
|
<addaction name="actionNew"/>
|
||||||
<addaction name="actionOpen"/>
|
<addaction name="actionOpen"/>
|
||||||
<addaction name="separator"/>
|
<addaction name="separator"/>
|
||||||
|
<addaction name="actionClose"/>
|
||||||
|
<addaction name="separator"/>
|
||||||
<addaction name="actionQuit"/>
|
<addaction name="actionQuit"/>
|
||||||
</widget>
|
</widget>
|
||||||
<widget class="QMenu" name="menuEdit">
|
<widget class="QMenu" name="menuEdit">
|
||||||
|
@ -128,6 +130,17 @@
|
||||||
<string>&About Tycho</string>
|
<string>&About Tycho</string>
|
||||||
</property>
|
</property>
|
||||||
</action>
|
</action>
|
||||||
|
<action name="actionClose">
|
||||||
|
<property name="enabled">
|
||||||
|
<bool>false</bool>
|
||||||
|
</property>
|
||||||
|
<property name="icon">
|
||||||
|
<iconset theme="window-close"/>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
|
<string>&Close</string>
|
||||||
|
</property>
|
||||||
|
</action>
|
||||||
</widget>
|
</widget>
|
||||||
<layoutdefault spacing="6" margin="11"/>
|
<layoutdefault spacing="6" margin="11"/>
|
||||||
<resources>
|
<resources>
|
||||||
|
@ -230,6 +243,22 @@
|
||||||
</hint>
|
</hint>
|
||||||
</hints>
|
</hints>
|
||||||
</connection>
|
</connection>
|
||||||
|
<connection>
|
||||||
|
<sender>actionClose</sender>
|
||||||
|
<signal>triggered()</signal>
|
||||||
|
<receiver>mdiArea</receiver>
|
||||||
|
<slot>closeActiveSubWindow()</slot>
|
||||||
|
<hints>
|
||||||
|
<hint type="sourcelabel">
|
||||||
|
<x>-1</x>
|
||||||
|
<y>-1</y>
|
||||||
|
</hint>
|
||||||
|
<hint type="destinationlabel">
|
||||||
|
<x>399</x>
|
||||||
|
<y>301</y>
|
||||||
|
</hint>
|
||||||
|
</hints>
|
||||||
|
</connection>
|
||||||
</connections>
|
</connections>
|
||||||
<slots>
|
<slots>
|
||||||
<slot>openMapProperties()</slot>
|
<slot>openMapProperties()</slot>
|
||||||
|
|
Loading…
Reference in New Issue