rename Copy layout to Duplicate

--improve button name in Layouts Editor
from Copy to Duplicate
work/spdx
Michail Vourlakos 4 years ago
parent 35ac94a5ec
commit e2206afbfd

@ -549,7 +549,7 @@ const Latte::Data::Layout Layouts::addLayoutByText(QString rawLayoutText)
return newLayout; return newLayout;
} }
void Layouts::copySelectedLayout() void Layouts::duplicateSelectedLayout()
{ {
int row = m_view->currentIndex().row(); int row = m_view->currentIndex().row();
@ -562,7 +562,7 @@ void Layouts::copySelectedLayout()
selectedLayoutOriginal = selectedLayoutOriginal.isEmpty() ? selectedLayoutCurrent : selectedLayoutOriginal; selectedLayoutOriginal = selectedLayoutOriginal.isEmpty() ? selectedLayoutCurrent : selectedLayoutOriginal;
//! Update original layout before copying if this layout is active //! Update original layout before duplicating if this layout is active
if (m_handler->corona()->layoutsManager()->memoryUsage() == MemoryUsage::MultipleLayouts) { if (m_handler->corona()->layoutsManager()->memoryUsage() == MemoryUsage::MultipleLayouts) {
Latte::CentralLayout *central = m_handler->corona()->layoutsManager()->synchronizer()->centralLayout(selectedLayoutOriginal.name); Latte::CentralLayout *central = m_handler->corona()->layoutsManager()->synchronizer()->centralLayout(selectedLayoutOriginal.name);
if (central) { if (central) {

@ -94,7 +94,7 @@ public:
void setOriginalInMultipleMode(const bool &inmultiple); void setOriginalInMultipleMode(const bool &inmultiple);
void copySelectedLayout(); void duplicateSelectedLayout();
const Latte::Data::Layout addLayoutForFile(QString file, QString layoutName = QString(), bool newTempDirectory = true); const Latte::Data::Layout addLayoutForFile(QString file, QString layoutName = QString(), bool newTempDirectory = true);
const Latte::Data::Layout addLayoutByText(QString rawLayoutText); const Latte::Data::Layout addLayoutByText(QString rawLayoutText);

@ -241,9 +241,9 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QPushButton" name="copyButton"> <widget class="QPushButton" name="duplicateButton">
<property name="text"> <property name="text">
<string>Copy</string> <string>Duplicate</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset theme="edit-copy"> <iconset theme="edit-copy">
@ -510,7 +510,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>953</width> <width>953</width>
<height>375</height> <height>383</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">

@ -154,12 +154,12 @@ void TabLayouts::initLayoutMenu()
connect(m_corona->templatesManager(), &Latte::Templates::Manager::layoutTemplatesChanged, this, &TabLayouts::initLayoutTemplatesSubMenu); connect(m_corona->templatesManager(), &Latte::Templates::Manager::layoutTemplatesChanged, this, &TabLayouts::initLayoutTemplatesSubMenu);
m_copyLayoutAction = m_layoutMenu->addAction(i18nc("copy layout", "&Copy")); m_duplicateLayoutAction = m_layoutMenu->addAction(i18nc("duplicate layout", "&Duplicate"));
m_copyLayoutAction->setToolTip(i18n("Copy selected layout")); m_duplicateLayoutAction->setToolTip(i18n("Duplicate selected layout"));
m_copyLayoutAction->setIcon(QIcon::fromTheme("edit-copy")); m_duplicateLayoutAction->setIcon(QIcon::fromTheme("edit-copy"));
m_copyLayoutAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_C)); m_duplicateLayoutAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_D));
connectActionWithButton(m_ui->copyButton, m_copyLayoutAction); connectActionWithButton(m_ui->duplicateButton, m_duplicateLayoutAction);
connect(m_copyLayoutAction, &QAction::triggered, this, &TabLayouts::copyLayout); connect(m_duplicateLayoutAction, &QAction::triggered, this, &TabLayouts::duplicateLayout);
m_removeLayoutAction = m_layoutMenu->addAction(i18nc("remove layout", "Remove")); m_removeLayoutAction = m_layoutMenu->addAction(i18nc("remove layout", "Remove"));
m_removeLayoutAction->setToolTip(i18n("Remove selected layout")); m_removeLayoutAction->setToolTip(i18n("Remove selected layout"));
@ -417,15 +417,15 @@ void TabLayouts::newLayout(const QString &templateName)
} }
} }
void TabLayouts::copyLayout() void TabLayouts::duplicateLayout()
{ {
qDebug() << Q_FUNC_INFO; qDebug() << Q_FUNC_INFO;
if (!isCurrentTab() || !m_copyLayoutAction->isEnabled()) { if (!isCurrentTab() || !m_duplicateLayoutAction->isEnabled()) {
return; return;
} }
m_layoutsController->copySelectedLayout(); m_layoutsController->duplicateSelectedLayout();
} }
void TabLayouts::installLayoutTemplate(Latte::Data::Layout importedLayout, QString templateFilePath, ImportedLayoutOrigin origin) void TabLayouts::installLayoutTemplate(Latte::Data::Layout importedLayout, QString templateFilePath, ImportedLayoutOrigin origin)

@ -97,8 +97,8 @@ private slots:
void loadConfig(); void loadConfig();
void saveConfig(); void saveConfig();
void copyLayout();
void downloadLayout(); void downloadLayout();
void duplicateLayout();
void switchLayout(); void switchLayout();
void importLayout(); void importLayout();
void exportLayoutForBackup(); void exportLayoutForBackup();
@ -143,7 +143,7 @@ private:
QAction *m_switchLayoutAction{nullptr}; QAction *m_switchLayoutAction{nullptr};
QAction *m_activitiesManagerAction{nullptr}; QAction *m_activitiesManagerAction{nullptr};
QAction *m_newLayoutAction{nullptr}; QAction *m_newLayoutAction{nullptr};
QAction *m_copyLayoutAction{nullptr}; QAction *m_duplicateLayoutAction{nullptr};
QAction *m_enabledLayoutAction{nullptr}; QAction *m_enabledLayoutAction{nullptr};
QAction *m_readOnlyLayoutAction{nullptr}; QAction *m_readOnlyLayoutAction{nullptr};
QAction *m_removeLayoutAction{nullptr}; QAction *m_removeLayoutAction{nullptr};

Loading…
Cancel
Save