forked from qt-creator/qt-creator
Editor: Allow to open links in a new split.
This changes current behavior while opening links. Link is now opened in next split by default. If you use CTRL+Click to open links, it will also open in next split. However, by using CTRL+ALT+click it will open in current split. There are two new checkboxes in Tools/Options/Text Editor/Display: - "Open Links in New Split" - if it is checked, links will not be opened in current split. However, if document with link is already opened, it will be used to open the split - "Force open links in next split" - Links will always open in next split, even if their document is already opened somewhere else. Task-number: QTCREATORBUG-8117 Change-Id: Ib99075b55d9e9683ed2c2386767227457de0a3fc Reviewed-by: David Schulz <david.schulz@digia.com>
This commit is contained in:
committed by
David Schulz
parent
c0e7b65db3
commit
39e9c5ef20
@@ -74,6 +74,7 @@ QWidget *DisplaySettingsPage::createPage(QWidget *parent)
|
||||
QWidget *w = new QWidget(parent);
|
||||
d->m_page = new Internal::Ui::DisplaySettingsPage;
|
||||
d->m_page->setupUi(w);
|
||||
connect(d->m_page->openLinksInNextSplit, SIGNAL(toggled(bool)), this, SLOT(updateForceOpenLinksInNextSplit(bool)));
|
||||
settingsToUI();
|
||||
if (d->m_searchKeywords.isEmpty()) {
|
||||
QTextStream(&d->m_searchKeywords) << d->m_page->displayLineNumbers->text()
|
||||
@@ -85,7 +86,9 @@ QWidget *DisplaySettingsPage::createPage(QWidget *parent)
|
||||
<< ' ' << d->m_page->highlightMatchingParentheses->text()
|
||||
<< ' ' << d->m_page->enableTextWrapping->text()
|
||||
<< ' ' << d->m_page->autoFoldFirstComment->text()
|
||||
<< ' ' << d->m_page->centerOnScroll->text();
|
||||
<< ' ' << d->m_page->centerOnScroll->text()
|
||||
<< ' ' << d->m_page->openLinksInNextSplit->text()
|
||||
<< ' ' << d->m_page->forceOpenLinksInNextSplit->text();
|
||||
d->m_searchKeywords.remove(QLatin1Char('&'));
|
||||
}
|
||||
return w;
|
||||
@@ -109,6 +112,13 @@ void DisplaySettingsPage::finish()
|
||||
d->m_page = 0;
|
||||
}
|
||||
|
||||
void DisplaySettingsPage::updateForceOpenLinksInNextSplit(bool openLinksInNextSplitChecked)
|
||||
{
|
||||
d->m_page->forceOpenLinksInNextSplit->setEnabled(openLinksInNextSplitChecked);
|
||||
if (!openLinksInNextSplitChecked)
|
||||
d->m_page->forceOpenLinksInNextSplit->setChecked(openLinksInNextSplitChecked);
|
||||
}
|
||||
|
||||
void DisplaySettingsPage::settingsFromUI(DisplaySettings &displaySettings) const
|
||||
{
|
||||
displaySettings.m_displayLineNumbers = d->m_page->displayLineNumbers->isChecked();
|
||||
@@ -124,6 +134,8 @@ void DisplaySettingsPage::settingsFromUI(DisplaySettings &displaySettings) const
|
||||
displaySettings.m_markTextChanges = d->m_page->markTextChanges->isChecked();
|
||||
displaySettings.m_autoFoldFirstComment = d->m_page->autoFoldFirstComment->isChecked();
|
||||
displaySettings.m_centerCursorOnScroll = d->m_page->centerOnScroll->isChecked();
|
||||
displaySettings.m_openLinksInNextSplit = d->m_page->openLinksInNextSplit->isChecked();
|
||||
displaySettings.m_forceOpenLinksInNextSplit = d->m_page->forceOpenLinksInNextSplit->isChecked();
|
||||
}
|
||||
|
||||
void DisplaySettingsPage::settingsToUI()
|
||||
@@ -142,6 +154,8 @@ void DisplaySettingsPage::settingsToUI()
|
||||
d->m_page->markTextChanges->setChecked(displaySettings.m_markTextChanges);
|
||||
d->m_page->autoFoldFirstComment->setChecked(displaySettings.m_autoFoldFirstComment);
|
||||
d->m_page->centerOnScroll->setChecked(displaySettings.m_centerCursorOnScroll);
|
||||
d->m_page->openLinksInNextSplit->setChecked(displaySettings.m_openLinksInNextSplit);
|
||||
d->m_page->forceOpenLinksInNextSplit->setChecked(displaySettings.m_forceOpenLinksInNextSplit);
|
||||
}
|
||||
|
||||
const DisplaySettings &DisplaySettingsPage::displaySettings() const
|
||||
|
||||
Reference in New Issue
Block a user