Skip to content

update #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Nov 2, 2014
Merged

update #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bd8a605
[kuroneko] subclass QTabWidget to expose tab re-order signal
konimaru Oct 26, 2014
f158e18
Revert "[kuroneko] subclass QTabWidget to expose tab re-order signal"
konimaru Oct 27, 2014
9e69f76
[IDE-1][kuroneko] the tab widgets are the editors so use them in place
konimaru Oct 27, 2014
bce9462
Merge pull request #1 from lamestation/master
konimaru Oct 27, 2014
d08eb8e
[kuroneko] avoid line ending dependency of version extractor (CRLF/LF…
konimaru Oct 27, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 21 additions & 26 deletions ide/mainwindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,17 +472,16 @@ void MainWindow::closeEvent(QCloseEvent *e)
void MainWindow::newFileAction()
{
newFile();
int tab = editors->count()-1;
int tab = editorTabs->count()-1;
setEditorCodeType(getEditor(tab), QString("UTF-16"));
}

void MainWindow::newFile()
{
changeTabDisable = true;
fileChangeDisable = true;
setupEditor();
int tab = editors->count()-1;
editorTabs->addTab(getEditor(tab),(const QString&)untitledstr);
editorTabs->addTab(createEditor(),(const QString&)untitledstr);
int tab = editorTabs->count()-1;
editorTabs->setCurrentIndex(tab);
editorTabs->setTabToolTip(tab, QString(""));
delete projectModel;
Expand Down Expand Up @@ -841,7 +840,7 @@ void MainWindow::fontDialog()
qDebug() << "New Editor Font" << font.family();

if(ok) {
for(int n = editors->count()-1; n >= 0; n--) {
for(int n = editorTabs->count()-1; n >= 0; n--) {
Editor *ed = getEditor(n);
ed->setFont(font);
QString fs = QString("font: %1pt \"%2\";").arg(font.pointSize()).arg(font.family());
Expand Down Expand Up @@ -877,7 +876,7 @@ void MainWindow::fontBigger()
if(size < 90)
font.setPointSize(size);
}
for(int n = editors->count()-1; n >= 0; n--) {
for(int n = editorTabs->count()-1; n >= 0; n--) {
Editor *ed = getEditor(n);
ed->setFont(font);
QString fs = QString("font: %1pt \"%2\";").arg(font.pointSize()).arg(font.family());
Expand Down Expand Up @@ -914,7 +913,7 @@ void MainWindow::fontSmaller()
if(size > 3)
font.setPointSize(size);
}
for(int n = editors->count()-1; n >= 0; n--) {
for(int n = editorTabs->count()-1; n >= 0; n--) {
Editor *ed = getEditor(n);
ed->setFont(font);
QString fs = QString("font: %1pt \"%2\";").arg(font.pointSize()).arg(font.family());
Expand Down Expand Up @@ -1607,7 +1606,6 @@ void MainWindow::closeTab(int index)
{
fileChangeDisable = true;
getEditor(index)->setPlainText("");
editors->remove(index);
if(editorTabs->count() == 1)
newFile();
editorTabs->removeTab(index);
Expand Down Expand Up @@ -1799,7 +1797,7 @@ void MainWindow::setEditor(int num, QString shortName, QString fileName, QString

Editor *MainWindow::getEditor(int num)
{
return editors->at(num);
return (Editor *)editorTabs->widget(num);
}

void MainWindow::setEditorCodeType(Editor *ed, QString name)
Expand All @@ -1814,7 +1812,6 @@ void MainWindow::setEditorCodeType(Editor *ed, QString name)

void MainWindow::clearTabHighlight()
{
//qDebug() << "clearTabHighlight" << "Total Tabs" << editorTabs->count() << "Total Editors" << editors->count() << "Current" << editorTabs->currentIndex();
emit highlightCurrentLine(QColor());
}

Expand Down Expand Up @@ -1977,7 +1974,7 @@ void MainWindow::initBoardTypes()
{
}

void MainWindow::setupEditor()
Editor *MainWindow::createEditor()
{
Editor *editor = new Editor(this);
editor->initSpin(&spinParser);
Expand All @@ -1996,13 +1993,14 @@ void MainWindow::setupEditor()
connect(editor,SIGNAL(textChanged()),this,SLOT(fileChanged()));
connect(editor,SIGNAL(cursorPositionChanged()),editor,SLOT(updateBackgroundColors()));
highlighter = new Highlighter(editor->document(), propDialog);
editors->append(editor);

return editor;
}

void MainWindow::tabSpacesChanged()
{
for(int n = 0; n < editors->count(); n++) {
Editor *ed = editors->at(n);
for(int n = 0; n < editorTabs->count(); n++) {
Editor *ed = getEditor(n);
QFontMetrics fm(editorFont);
int spaces = propDialog->getTabSpaces();
int width = fm.width(QLatin1Char('9'));
Expand Down Expand Up @@ -2159,9 +2157,6 @@ void MainWindow::setupProjectTools(QSplitter *vsplit)
rightSplit->setOrientation(Qt::Vertical);
vsplit->addWidget(rightSplit);

/* project editors */
editors = new QVector<Editor*>();

/* project editor tabs */
editorTabs = new QTabWidget(this);
editorTabs->setTabsClosable(true);
Expand Down Expand Up @@ -2378,7 +2373,7 @@ QFrame *MainWindow::newFindFrame(QSplitter *split)

void MainWindow::showFindFrame()
{
Editor *editor = editors->at(editorTabs->currentIndex());
Editor *editor = getEditor(editorTabs->currentIndex());
if(editor->textCursor().selectedText().length() > 0) {
setFindText(editor->textCursor().selectedText());
}
Expand Down Expand Up @@ -2416,7 +2411,7 @@ QTextDocument::FindFlag MainWindow::getFlags(int prev)

void MainWindow::findChanged(QString text)
{
Editor *editor = editors->at(editorTabs->currentIndex());
Editor *editor = getEditor(editorTabs->currentIndex());

if(editor == NULL)
return;
Expand Down Expand Up @@ -2463,7 +2458,7 @@ void MainWindow::findClicked()
void MainWindow::findNextClicked()
{

Editor *editor = editors->at(editorTabs->currentIndex());
Editor *editor = getEditor(editorTabs->currentIndex());
if(editor == NULL)
return;

Expand Down Expand Up @@ -2513,7 +2508,7 @@ void MainWindow::findNextClicked()
}
void MainWindow::findPrevClicked()
{
Editor *editor = editors->at(editorTabs->currentIndex());
Editor *editor = getEditor(editorTabs->currentIndex());
if(editor == NULL)
return;

Expand Down Expand Up @@ -2599,7 +2594,7 @@ void MainWindow::replaceClicked()
*/
void MainWindow::replaceNextClicked()
{
Editor *editor = editors->at(editorTabs->currentIndex());
Editor *editor = getEditor(editorTabs->currentIndex());
if(editor == NULL)
return;

Expand All @@ -2619,7 +2614,7 @@ void MainWindow::replaceNextClicked()
*/
void MainWindow::replacePrevClicked()
{
Editor *editor = editors->at(editorTabs->currentIndex());
Editor *editor = getEditor(editorTabs->currentIndex());
if(editor == NULL)
return;

Expand All @@ -2641,7 +2636,7 @@ void MainWindow::replaceAllClicked()
{
int count = 0;
QString text = findEdit->text();
Editor *editor = editors->at(editorTabs->currentIndex());
Editor *editor = getEditor(editorTabs->currentIndex());
if(editor == NULL)
return;

Expand Down Expand Up @@ -2692,7 +2687,7 @@ bool MainWindow::showBeginMessage(QString type)
if(ret == QMessageBox::Cancel) {
return false;
}
Editor *editor = editors->at(editorTabs->currentIndex());
Editor *editor = getEditor(editorTabs->currentIndex());
if(editor == NULL)
return false;
QTextCursor cur = editor->textCursor();
Expand All @@ -2709,7 +2704,7 @@ bool MainWindow::showEndMessage(QString type)
if(ret == QMessageBox::Cancel) {
return false;
}
Editor *editor = editors->at(editorTabs->currentIndex());
Editor *editor = getEditor(editorTabs->currentIndex());
if(editor == NULL)
return false;
QTextCursor cur = editor->textCursor();
Expand Down
3 changes: 1 addition & 2 deletions ide/mainwindow.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ public slots:
bool isFileUTF16(QFile *file);
void openFileName(QString fileName);
void checkAndSaveFiles();
void setupEditor();
Editor *createEditor();
void clearTabHighlight();
void setupFileMenu();
void setupHelpMenu();
Expand Down Expand Up @@ -254,7 +254,6 @@ public slots:
int wasClicked;

QTabWidget *editorTabs;
QVector<Editor*> *editors;
QFont editorFont;
bool fileChangeDisable;
bool changeTabDisable;
Expand Down
2 changes: 1 addition & 1 deletion makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ DIR_DEB := $(DIR_STAGING)/DEBIAN

VERSION := $(shell echo `grep -r VERSION= $(DIR_IDE)/PropellerIDE.pro \
| cut -d'=' -f3 \
| cut -d' ' -f 1` \
| sed -e 's/[\r]//g'` \
| sed -e 's/ /./g')

ARCH := $(shell arch)
Expand Down