Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
K
kumir2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
2
Issues
2
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
kumir
kumir2
Commits
d4954c3f
Commit
d4954c3f
authored
Jan 15, 2015
by
Denis Khachko
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bug Fixes.
parent
91a51442
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
36 additions
and
7 deletions
+36
-7
src/actors/vodoley/vodoley.json
src/actors/vodoley/vodoley.json
+16
-2
src/actors/vodoley/vodoleymodule.cpp
src/actors/vodoley/vodoleymodule.cpp
+12
-0
src/actors/vodoley/vodoleymodule.h
src/actors/vodoley/vodoleymodule.h
+3
-0
src/plugins/coursemanager/task/mainwindow.cpp
src/plugins/coursemanager/task/mainwindow.cpp
+4
-4
src/shared/widgets/pultlogger.cpp
src/shared/widgets/pultlogger.cpp
+1
-1
No files found.
src/actors/vodoley/vodoley.json
View file @
d4954c3f
...
...
@@ -21,8 +21,22 @@
"name"
:
{
"ascii"
:
"task complited"
,
"ru_RU"
:
"@решено"
},
"async"
:
false
,
"returnType"
:
"bool"
}
},
{
"name"
:
{
"ascii"
:
"size A"
,
"ru_RU"
:
"размер A"
},
"async"
:
false
,
"returnType"
:
"int"
},
{
"name"
:
{
"ascii"
:
"size B"
,
"ru_RU"
:
"размер B"
},
"async"
:
false
,
"returnType"
:
"int"
},
{
"name"
:
{
"ascii"
:
"size C"
,
"ru_RU"
:
"размер C"
},
"async"
:
false
,
"returnType"
:
"int"
}
],
"gui"
:
{
"windows"
:
[
...
...
src/actors/vodoley/vodoleymodule.cpp
View file @
d4954c3f
...
...
@@ -253,6 +253,18 @@ private:
return
MainWindow
->
ready
();
}
int
VodoleyModule
::
runSizeA
()
{
return
MainWindow
->
Asize
();
};
int
VodoleyModule
::
runSizeB
()
{
return
MainWindow
->
Bsize
();
};
int
VodoleyModule
::
runSizeC
()
{
return
MainWindow
->
Csize
();
};
void
VodoleyModule
::
openRecent
()
{
...
...
src/actors/vodoley/vodoleymodule.h
View file @
d4954c3f
...
...
@@ -51,6 +51,9 @@ public slots:
void
runFromBToC
();
void
runFromCToB
();
void
runFromCToA
();
int
runSizeA
();
int
runSizeB
();
int
runSizeC
();
bool
runTaskComplited
();
void
openRecent
();
void
updateLastFiles
(
const
QString
newFile
);
...
...
src/plugins/coursemanager/task/mainwindow.cpp
View file @
d4954c3f
...
...
@@ -677,14 +677,14 @@ void MainWindowTask::saveCourse()
// //curDir=fi.absolutePath ();
// qDebug()<<"curDir"<<curDir;
// QString fileName=dialog.selectedFiles().first();
const
QString
fileName
=
QFileDialog
::
getSaveFileName
(
QString
fileName
=
QFileDialog
::
getSaveFileName
(
this
,
trUtf8
(
"Сохранить изменения"
),
curDir
,
tr
(
"Work files(*.work.xml);;All files (*)"
)
);
//
QString type=fileName.right(9);
//
if(type!=".work.xml")fileName+=".work.xml";
QString
type
=
fileName
.
right
(
9
);
if
(
type
!=
".work.xml"
)
fileName
+=
".work.xml"
;
cursWorkFile
.
setFileName
(
fileName
);
updateLastFiles
(
fileName
);
saveCourseFile
();
...
...
@@ -834,7 +834,7 @@ void MainWindowTask::closeEvent(QCloseEvent *event)
{
QMessageBox
::
StandardButton
ans
;
ans
=
QMessageBox
::
question
(
this
,
trUtf8
(
"Курсы"
),
trUtf8
(
"Вы хотите сохранить работу?"
),
QMessageBox
::
Yes
|
QMessageBox
::
No
|
QMessageBox
::
Cancel
,
QMessageBox
::
Yes
);
QMessageBox
::
Yes
|
QMessageBox
::
No
,
QMessageBox
::
Yes
);
if
(
ans
==
QMessageBox
::
No
)
{
...
...
src/shared/widgets/pultlogger.cpp
View file @
d4954c3f
...
...
@@ -56,7 +56,7 @@ void logLine::moveDown()
void
pultLogger
::
appendText
(
QString
kumCommand
,
QString
text
,
QString
replay
)
{
while
(
pos
>
H
-
68
)
downBtnPressed
();
lines
.
append
(
logLine
(
kumCommand
,
text
,
replay
,
dummyFrame
,
respFrame
,
pos
));
lines
.
append
(
logLine
(
kumCommand
+
'\n'
,
text
,
replay
,
dummyFrame
,
respFrame
,
pos
));
pos
=
pos
+
TEXT_STEP
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment