- enhancement: show error message when user set a shortcut that's already being used.

This commit is contained in:
Roy Qu 2022-05-14 16:54:59 +08:00
parent 6340dbe299
commit fbe7ca204c
3 changed files with 39 additions and 13 deletions

View File

@ -1641,6 +1641,14 @@
<source>Shortcut</source> <source>Shortcut</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Shortcut &quot;%1&quot; is used by &quot;%2&quot;.</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>EnvironmentShortcutWidget</name> <name>EnvironmentShortcutWidget</name>

View File

@ -2276,17 +2276,27 @@ Are you really want to continue?</oldsource>
<context> <context>
<name>EnvironmentShortcutModel</name> <name>EnvironmentShortcutModel</name>
<message> <message>
<location filename="settingsdialog/environmentshortcutwidget.cpp" line="75"/> <location filename="settingsdialog/environmentshortcutwidget.cpp" line="76"/>
<source>action</source> <source>action</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="settingsdialog/environmentshortcutwidget.cpp" line="136"/> <location filename="settingsdialog/environmentshortcutwidget.cpp" line="128"/>
<source>Error</source>
<translation></translation>
</message>
<message>
<location filename="settingsdialog/environmentshortcutwidget.cpp" line="129"/>
<source>Shortcut &quot;%1&quot; is used by &quot;%2&quot;.</source>
<translation>%1%2使</translation>
</message>
<message>
<location filename="settingsdialog/environmentshortcutwidget.cpp" line="148"/>
<source>Function</source> <source>Function</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="settingsdialog/environmentshortcutwidget.cpp" line="138"/> <location filename="settingsdialog/environmentshortcutwidget.cpp" line="150"/>
<source>Shortcut</source> <source>Shortcut</source>
<translation></translation> <translation></translation>
</message> </message>
@ -7409,27 +7419,27 @@ Are you really want to continue?</oldsource>
<translation>(-Wfatal-errors)</translation> <translation>(-Wfatal-errors)</translation>
</message> </message>
<message> <message>
<location filename="compiler/compilerinfo.cpp" line="163"/> <location filename="compiler/compilerinfo.cpp" line="170"/>
<source>Linker</source> <source>Linker</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="compiler/compilerinfo.cpp" line="164"/> <location filename="compiler/compilerinfo.cpp" line="171"/>
<source>Link an Objective C program (-lobjc)</source> <source>Link an Objective C program (-lobjc)</source>
<translation>Objective-C程序 (-lobjc)</translation> <translation>Objective-C程序 (-lobjc)</translation>
</message> </message>
<message> <message>
<location filename="compiler/compilerinfo.cpp" line="165"/> <location filename="compiler/compilerinfo.cpp" line="172"/>
<source>Do not use standard system libraries (-nostdlib)</source> <source>Do not use standard system libraries (-nostdlib)</source>
<translation>使(-nostdlib)</translation> <translation>使(-nostdlib)</translation>
</message> </message>
<message> <message>
<location filename="compiler/compilerinfo.cpp" line="166"/> <location filename="compiler/compilerinfo.cpp" line="173"/>
<source>Do not create a console window (-mwindows)</source> <source>Do not create a console window (-mwindows)</source>
<translation>(-mwindows)</translation> <translation>(-mwindows)</translation>
</message> </message>
<message> <message>
<location filename="compiler/compilerinfo.cpp" line="167"/> <location filename="compiler/compilerinfo.cpp" line="174"/>
<source>Strip executable (-s)</source> <source>Strip executable (-s)</source>
<translation>(-s)</translation> <translation>(-s)</translation>
</message> </message>
@ -7438,27 +7448,27 @@ Are you really want to continue?</oldsource>
<translation type="vanished">Ojbective C程序(-lobjc)</translation> <translation type="vanished">Ojbective C程序(-lobjc)</translation>
</message> </message>
<message> <message>
<location filename="compiler/compilerinfo.cpp" line="170"/> <location filename="compiler/compilerinfo.cpp" line="163"/>
<source>Output</source> <source>Output</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="compiler/compilerinfo.cpp" line="171"/> <location filename="compiler/compilerinfo.cpp" line="164"/>
<source>Put comments in generated assembly code (-fverbose-asm)</source> <source>Put comments in generated assembly code (-fverbose-asm)</source>
<translation>(-fverbose-asm)</translation> <translation>(-fverbose-asm)</translation>
</message> </message>
<message> <message>
<location filename="compiler/compilerinfo.cpp" line="173"/> <location filename="compiler/compilerinfo.cpp" line="166"/>
<source>Do not compile, stop after the preprocessing stage (-E)</source> <source>Do not compile, stop after the preprocessing stage (-E)</source>
<translation>-E)</translation> <translation>-E)</translation>
</message> </message>
<message> <message>
<location filename="compiler/compilerinfo.cpp" line="174"/> <location filename="compiler/compilerinfo.cpp" line="167"/>
<source>Use pipes instead of temporary files during compilation (-pipe)</source> <source>Use pipes instead of temporary files during compilation (-pipe)</source>
<translation>使(-pipe)</translation> <translation>使(-pipe)</translation>
</message> </message>
<message> <message>
<location filename="compiler/compilerinfo.cpp" line="172"/> <location filename="compiler/compilerinfo.cpp" line="165"/>
<source>Do not assemble, compile and generate the assemble code (-S)</source> <source>Do not assemble, compile and generate the assemble code (-S)</source>
<translation>(-S)</translation> <translation>(-S)</translation>
</message> </message>

View File

@ -1641,6 +1641,14 @@
<source>Shortcut</source> <source>Shortcut</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Shortcut &quot;%1&quot; is used by &quot;%2&quot;.</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>EnvironmentShortcutWidget</name> <name>EnvironmentShortcutWidget</name>