Commit a5001d20 authored by Victor Yacovlev's avatar Victor Yacovlev

Merge branch 'master' of gitorious.org:kumir2/kumir2

parents fb46a688 d690d782
share/kumir2/actors/robot/kumir.png

6.74 KB | W: | H:

share/kumir2/actors/robot/kumir.png

515 Bytes | W: | H:

share/kumir2/actors/robot/kumir.png
share/kumir2/actors/robot/kumir.png
share/kumir2/actors/robot/kumir.png
share/kumir2/actors/robot/kumir.png
  • 2-up
  • Swipe
  • Onion skin
......@@ -4095,7 +4095,7 @@ void RobotModule::loadEnv()
view->centerOn(field->m_height()/2,field->m_width()/2);
NewWindow->close();
editEnv();
if(!field->isEditMode())editEnv();
};
void RobotModule::newEnv()
{
......@@ -4105,17 +4105,17 @@ void RobotModule::loadEnv()
QMessageBox messageBox(
QMessageBox::Question,
tr("New field"),
tr("Save current field?"),
trUtf8("Новая обстановка"),
trUtf8("Сохранить текущую?"),
QMessageBox::NoButton,mainWidget()
);
QPushButton * btnSave =
messageBox.addButton(tr("Save"), QMessageBox::AcceptRole);
messageBox.addButton(tr("Сохранить"), QMessageBox::AcceptRole);
QPushButton * btnDiscard =
messageBox.addButton(tr("Don't save"), QMessageBox::DestructiveRole);
messageBox.addButton(tr("Не сохранять"), QMessageBox::DestructiveRole);
QPushButton * btnCancel =
messageBox.addButton(tr("Cancel"), QMessageBox::RejectRole);
messageBox.addButton(tr("Отмена"), QMessageBox::RejectRole);
messageBox.setDefaultButton(btnSave);
messageBox.exec();
......
......@@ -385,6 +385,7 @@ void VodoleyPult::BOutS()
void VodoleyPult::COutS()
{
if(!greenLight->link())return;
if(VodoleyObj->Csize()==0){Logger->appendText(trUtf8("вылей C"),trUtf8("вылей C"),trUtf8("Отказ"));return;}
Logger->appendText(trUtf8("вылей C"),trUtf8("вылей C"),"OK");
VodoleyObj->MoveFromTo(2,3);
}
......@@ -425,7 +426,7 @@ void VodoleyPult::FillBs()
void VodoleyPult::FillCs()
{
if(!greenLight->link())return;
if(VodoleyObj->Csize()==0){Logger->appendText(trUtf8("наполни C"),trUtf8("наполни C"),trUtf8("Отказ"));return;}
Logger->appendText(trUtf8("наполни C"),trUtf8("наполни C"),"OK");
VodoleyObj->FillC();
}
......@@ -451,7 +452,7 @@ void VodoleyPult::AtoBS()
void VodoleyPult::CtoAS()
{
if(!greenLight->link())return;
if(VodoleyObj->Csize()==0){Logger->appendText(trUtf8("перелей из C в A"),trUtf8("перелей из C в A"),trUtf8("Отказ"));return;}
Logger->appendText(trUtf8("перелей из C в A"),trUtf8("перелей из C в A"),"OK");
VodoleyObj->MoveFromTo(2,0);
}
......@@ -460,7 +461,7 @@ void VodoleyPult::CtoAS()
void VodoleyPult::CtoBS()
{
if(!greenLight->link())return;
if(VodoleyObj->Csize()==0){Logger->appendText(trUtf8("перелей из C в B"),trUtf8("перелей из C в B"),trUtf8("Отказ"));return;}
Logger->appendText(trUtf8("перелей из C в B"),trUtf8("перелей из C в B"),"OK");
VodoleyObj->MoveFromTo(2,1);
}
......
......@@ -307,6 +307,7 @@ void Vodoley::createActions(QList<QAction*> actions)
connect(actLoad, SIGNAL(triggered()), this, SLOT(loadZ()));
actSave=actions.at(2);
connect(actSave, SIGNAL(triggered()), this, SLOT(saveZ()));
};
......
......@@ -73,42 +73,5 @@
]
},
"settings": {
"TextColor": {
"type": "color",
"default": "#FFFFFF",
"title": {"ascii": "Text color", "ru_RU": "Цвет смиволов"}
},
"LineColor": {
"type": "color",
"default": "#C8C800",
"title": {"ascii": "Grid color", "ru_RU": "Цвет сетки"}
},
"LineColorEdit": {
"type": "color",
"default": "#C8C800",
"title": {"ascii": "Grid color (edit mode)", "ru_RU": "Цвет сетки (редактирование)"}
},
"WallColor": {
"type": "color",
"default": "#C8C800",
"title": {"ascii": "Wall color", "ru_RU": "Цвет стен"}
},
"NormalColor": {
"type": "color",
"default": "#289628",
"title": {"ascii": "Background color", "ru_RU": "Цвет поля"}
},
"EditColor": {
"type": "color",
"default": "#00008C",
"title": {"ascii": "Background color (edit mode)", "ru_RU": "Цвет поля (редактирование)"}
},
"CellSize": {
"type": "int",
"default": 20,
"minimum": 10,
"maximum": 40,
"title": {"ascii": "Cell size", "ru_RU": "Размер клетки"}
}
}
}
......@@ -38,6 +38,7 @@ void VodoleyModule::createGui()
actions.append(m_actionVodoleyLoadEnvironment);
actions.append(m_actionVodoleySaveEnvironment);
MainWindow->createActions(actions);
connect(m_actionVodoleyRevertEnvironment,SIGNAL(triggered()) , MainWindow, SLOT(reset()));
// m_actionVodoleyNewEnvironment
}
......
......@@ -16,7 +16,7 @@ Plugin::Plugin()
{
courseMenu=new QMenu(trUtf8("Практикум"));
MenuList.append(courseMenu);
rescentMenu=new QMenu(trUtf8("Недавние тетради..."));
rescentMenu=new QMenu(trUtf8("Недавние тетради/курсы..."));
// m_actionCourseLoadRescent->setMenu(rescentMenu);
MW=new MainWindowTask();
MW->setup(myResourcesDir(), mySettings());
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment