P35124786
/
notepad--
mirror of https://gitee.com/cxasm/notepad--.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

!65 美化界面 

Merge pull request !65 from cleverxiao/develop
This commit is contained in:
爬山虎 2023-03-14 14:35:44 +00:00 committed by Gitee
parent 2b3e9b6314 c3db4ae41d
commit 61abdf0c4c
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
9 changed files with 120 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cceditor/ccnotepad.cpp
View File

@ -7387,7 +7387,7 @@ void CCNotePad::slot_gotoline()
int lineCounts = 2147483647; int lineCounts = 2147483647;
bool ok; bool ok;
int num = QInputDialog::getInt(this, tr("Go to line"), tr("Line Num:"), 1, 1, lineCounts, 1, &ok); int num = QInputDialog::getInt(this, tr("Go to line"), tr("Line Num:"), 1, 1, lineCounts, 1, &ok,Qt::WindowCloseButtonHint);
if (ok) if (ok)
{ {

2
src/columnedit.cpp
View File

@ -7,7 +7,7 @@ ColumnEdit::ColumnEdit(QWidget *parent)
ui.setupUi(this); ui.setupUi(this);
connect(ui.addPrefix, &QCheckBox::stateChanged, this, &ColumnEdit::slot_addPrefix); connect(ui.addPrefix, &QCheckBox::stateChanged, this, &ColumnEdit::slot_addPrefix);
connect(ui.is16, &QRadioButton::clicked, this, &ColumnEdit::slot_bigChar); connect(ui.is16, &QRadioButton::toggled, this, &ColumnEdit::slot_bigChar);
} }
ColumnEdit::~ColumnEdit() ColumnEdit::~ColumnEdit()

2
src/doctypelistview.cpp
View File

@ -247,7 +247,7 @@ void DocTypeListView::slot_customContextMenuRequested(const QPoint& /*pos*/)
void DocTypeListView::slot_addCustomType() void DocTypeListView::slot_addCustomType()
{ {
bool ok = false; bool ok = false;
QString text = QInputDialog::getText(this, tr("input file ext()"), tr("ext (Split With :)"), QLineEdit::Normal, QString(".h:.cpp"), &ok); QString text = QInputDialog::getText(this, tr("input file ext()"), tr("ext (Split With :)"), QLineEdit::Normal, QString(".h:.cpp"), &ok,Qt::WindowCloseButtonHint);
if (ok && !text.isEmpty()) if (ok && !text.isEmpty())
{ {

2
src/encodeconvert.cpp
View File

@ -109,7 +109,7 @@ void EncodeConvert::slot_itemClicked(QTreeWidgetItem* item, int /*column*/)
void EncodeConvert::slot_userDefineExt() void EncodeConvert::slot_userDefineExt()
{ {
bool ok = false; bool ok = false;
QString text = QInputDialog::getText(this, tr("input file ext()"),tr("ext (Split With :)"), QLineEdit::Normal, QString(".h:.cpp"), &ok); QString text = QInputDialog::getText(this, tr("input file ext()"),tr("ext (Split With :)"), QLineEdit::Normal, QString(".h:.cpp"), &ok,Qt::WindowCloseButtonHint);
if (ok && !text.isEmpty()) if (ok && !text.isEmpty())
{ {

2
src/langstyledefine.cpp
View File

@ -102,7 +102,7 @@ void LangStyleDefine::loadUserLangs()
void LangStyleDefine::slot_new() void LangStyleDefine::slot_new()
{ {
QString name = QInputDialog::getText(this, tr("Create New Languages"), tr("Please Input Languages Name")); QString name = QInputDialog::getText(this, tr("Create New Languages"), tr("Please Input Languages Name"),QLineEdit::Normal,QString(),nullptr,Qt::WindowCloseButtonHint);
if (!name.isEmpty()) if (!name.isEmpty())
{ {

3
src/progresswin.cpp
View File

@ -6,6 +6,9 @@ ProgressWin::ProgressWin(QWidget *parent)
: QDialog(parent), m_curStep(0),m_isCancel(false) : QDialog(parent), m_curStep(0),m_isCancel(false)
{ {
ui.setupUi(this); ui.setupUi(this);
Qt::WindowFlags flags = Qt::Dialog;
flags |= Qt::WindowCloseButtonHint;
setWindowFlags(flags);
} }
ProgressWin::~ProgressWin() ProgressWin::~ProgressWin()

8
src/renamewin.cpp
View File

@ -19,6 +19,8 @@ ReNameWin::ReNameWin(QWidget *parent)
connect(ui.radioButtonDelSuffix, &QRadioButton::toggled, this, [this](bool status) {slot_renameOptionsChange(4, status); }); connect(ui.radioButtonDelSuffix, &QRadioButton::toggled, this, [this](bool status) {slot_renameOptionsChange(4, status); });
connect(ui.radioButtonLower, &QRadioButton::toggled, this, [this](bool status) {slot_renameOptionsChange(5, status); }); connect(ui.radioButtonLower, &QRadioButton::toggled, this, [this](bool status) {slot_renameOptionsChange(5, status); });
connect(ui.radioButtonUpper, &QRadioButton::toggled, this, [this](bool status) {slot_renameOptionsChange(6, status); }); connect(ui.radioButtonUpper, &QRadioButton::toggled, this, [this](bool status) {slot_renameOptionsChange(6, status); });
ui.radioButtonAddPrefix->toggled(true);
} }
ReNameWin::~ReNameWin() ReNameWin::~ReNameWin()
@ -55,7 +57,7 @@ void ReNameWin::slot_renameOptionsChange(int id, bool status)
case 4: case 4:
ui.lineEditDelSuffix->setEnabled(status); ui.lineEditDelSuffix->setEnabled(status);
break; break;
default: default:
break; break;
} }
} }
@ -63,7 +65,7 @@ void ReNameWin::slot_renameOptionsChange(int id, bool status)
void ReNameWin::slot_userDefineExt() void ReNameWin::slot_userDefineExt()
{ {
bool ok = false; bool ok = false;
QString text = QInputDialog::getText(this, tr("input file ext()"), tr("ext (Start With .)"), QLineEdit::Normal, QString(".cpp"), &ok); QString text = QInputDialog::getText(this, tr("input file ext()"), tr("ext (Start With .)"), QLineEdit::Normal, QString(".cpp"), &ok,Qt::WindowCloseButtonHint);
if (ok && !text.isEmpty()) if (ok && !text.isEmpty())
{ {
@ -216,7 +218,7 @@ void ReNameWin::changeFileName()
return QString("%1/%2.%3").arg(dir.absolutePath()).arg(fi.baseName().toLower()).arg(fi.suffix()); return QString("%1/%2.%3").arg(dir.absolutePath()).arg(fi.baseName().toLower()).arg(fi.suffix());
case 5: case 5:
return QString("%1/%2.%3").arg(dir.absolutePath()).arg(fi.baseName().toUpper()).arg(fi.suffix()); return QString("%1/%2.%3").arg(dir.absolutePath()).arg(fi.baseName().toUpper()).arg(fi.suffix());
default: default:
break; break;
} }
return QString(); return QString();

184
src/renamewin.ui
View File

@ -38,6 +38,12 @@
</item> </item>
<item> <item>
<widget class="QToolButton" name="toolButtonBrowse"> <widget class="QToolButton" name="toolButtonBrowse">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text"> <property name="text">
<string>Browse</string> <string>Browse</string>
</property> </property>
@ -54,76 +60,96 @@
<attribute name="title"> <attribute name="title">
<string>AddDelNameString</string> <string>AddDelNameString</string>
</attribute> </attribute>
<layout class="QGridLayout" name="gridLayout"> <layout class="QVBoxLayout" name="verticalLayout_3">
<item row="0" column="0"> <item>
<widget class="QRadioButton" name="radioButtonAddPrefix"> <layout class="QGridLayout" name="gridLayout">
<property name="text"> <item row="0" column="0">
<string>Add Prefix</string> <widget class="QRadioButton" name="radioButtonAddPrefix">
</property> <property name="text">
</widget> <string>Add Prefix</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="lineEditAddPrefix">
<property name="enabled">
<bool>false</bool>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QRadioButton" name="radioButtonDelPrefix">
<property name="text">
<string>Del Prefix</string>
</property>
</widget>
</item>
<item row="0" column="3">
<widget class="QLineEdit" name="lineEditDelPrefix">
<property name="enabled">
<bool>false</bool>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QRadioButton" name="radioButtonAddSuffix">
<property name="text">
<string>Add Suffix</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="lineEditAddSuffix">
<property name="enabled">
<bool>false</bool>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QRadioButton" name="radioButtonDelSuffix">
<property name="text">
<string>Del Suffix</string>
</property>
</widget>
</item>
<item row="1" column="3">
<widget class="QLineEdit" name="lineEditDelSuffix">
<property name="enabled">
<bool>false</bool>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QRadioButton" name="radioButtonLower">
<property name="text">
<string>Lower FileName</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QRadioButton" name="radioButtonUpper">
<property name="text">
<string>Upper FileName</string>
</property>
</widget>
</item>
</layout>
</item> </item>
<item row="0" column="1"> <item>
<widget class="QLineEdit" name="lineEditAddPrefix"> <spacer name="verticalSpacer_2">
<property name="enabled"> <property name="orientation">
<bool>false</bool> <enum>Qt::Vertical</enum>
</property> </property>
</widget> <property name="sizeHint" stdset="0">
</item> <size>
<item row="0" column="2"> <width>20</width>
<widget class="QRadioButton" name="radioButtonDelPrefix"> <height>35</height>
<property name="text"> </size>
<string>Del Prefix</string>
</property> </property>
</widget> </spacer>
</item>
<item row="0" column="3">
<widget class="QLineEdit" name="lineEditDelPrefix">
<property name="enabled">
<bool>false</bool>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QRadioButton" name="radioButtonAddSuffix">
<property name="text">
<string>Add Suffix</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="lineEditAddSuffix">
<property name="enabled">
<bool>false</bool>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QRadioButton" name="radioButtonDelSuffix">
<property name="text">
<string>Del Suffix</string>
</property>
</widget>
</item>
<item row="1" column="3">
<widget class="QLineEdit" name="lineEditDelSuffix">
<property name="enabled">
<bool>false</bool>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QRadioButton" name="radioButtonLower">
<property name="text">
<string>Lower FileName</string>
</property>
</widget>
</item>
<item row="2" column="1" colspan="2">
<widget class="QRadioButton" name="radioButtonUpper">
<property name="text">
<string>Upper FileName</string>
</property>
</widget>
</item> </item>
</layout> </layout>
</widget> </widget>
@ -131,44 +157,40 @@
<attribute name="title"> <attribute name="title">
<string>ChangeExt</string> <string>ChangeExt</string>
</attribute> </attribute>
<layout class="QVBoxLayout" name="verticalLayout_3"> <layout class="QVBoxLayout" name="verticalLayout">
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_7"> <layout class="QGridLayout" name="gridLayout_2">
<item> <item row="0" column="0">
<widget class="QLabel" name="label_2"> <widget class="QLabel" name="label_2">
<property name="text"> <property name="text">
<string>Modify Ext To</string> <string>Modify Ext To</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item row="0" column="1">
<widget class="QLineEdit" name="lineEditDestExt"/> <widget class="QLineEdit" name="lineEditDestExt"/>
</item> </item>
<item> <item row="0" column="2" colspan="2">
<spacer name="horizontalSpacer_4"> <spacer name="horizontalSpacer_4">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>40</width> <width>78</width>
<height>20</height> <height>20</height>
</size> </size>
</property> </property>
</spacer> </spacer>
</item> </item>
</layout> <item row="1" column="0">
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_9">
<item>
<widget class="QLabel" name="label_3"> <widget class="QLabel" name="label_3">
<property name="text"> <property name="text">
<string>Deal Ext Type</string> <string>Deal Ext Type</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item row="1" column="1">
<widget class="QComboBox" name="comboBoxExt"> <widget class="QComboBox" name="comboBoxExt">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
@ -183,14 +205,14 @@
</item> </item>
</widget> </widget>
</item> </item>
<item> <item row="1" column="2">
<widget class="QToolButton" name="definedFilterExt"> <widget class="QToolButton" name="definedFilterExt">
<property name="text"> <property name="text">
<string>defined</string> <string>defined</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item row="1" column="3">
<spacer name="horizontalSpacer_3"> <spacer name="horizontalSpacer_3">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>

5
src/shortcutkeyeditwin.cpp
View File

@ -5,8 +5,11 @@
ShortcutKeyEditWin::ShortcutKeyEditWin(QWidget *parent) ShortcutKeyEditWin::ShortcutKeyEditWin(QWidget *parent)
: QDialog(parent) : QDialog(parent)
{ {
ui.setupUi(this); ui.setupUi(this);
ui.keySequenceEdit->setFocus(); ui.keySequenceEdit->setFocus();
Qt::WindowFlags flags = Qt::Dialog;
flags |= Qt::WindowCloseButtonHint;
setWindowFlags(flags);
} }
ShortcutKeyEditWin::~ShortcutKeyEditWin() ShortcutKeyEditWin::~ShortcutKeyEditWin()