Added line numbers, fixed some bugs, fixed console, added license.

ivanmrsulja · ivanmrsulja · commit e68f4f095097 · 2020-03-03T21:58:29.000+01:00
diff --git a/controller/TerminalConsole.py b/controller/TerminalConsole.py
@@ -1,7 +1,7 @@
 """
     i386ide is lightweight IDE for i386 assembly and C programming language.
     Copyright (C) 2019  Dušan Erdeljan, Marko Njegomir
-    Redistributed by: Mrsulja Ivan
+    Redistributed by: Mršulja Ivan
 
     This file is part of i386ide.
     This program is free software: you can redistribute it and/or modify
diff --git a/controller/TerminalController.py b/controller/TerminalController.py
@@ -1,7 +1,7 @@
 """
     i386ide is lightweight IDE for i386 assembly and C programming language.
     Copyright (C) 2019  Dušan Erdeljan, Marko Njegomir
-    Redistributed by: Mrsulja Ivan
+    Redistributed by: Mršulja Ivan
 
     This file is part of i386ide.
     This program is free software: you can redistribute it and/or modify
diff --git a/model/Autocompleter.py b/model/Autocompleter.py
@@ -1,4 +1,21 @@
-from PyQt5 import QtGui,QtCore,QtWidgets
+"""
+    Brick is lightweight IDE for C programming language.
+    Copyright (C) 2020 : Mršulja Ivan
+
+    This file is part of Brick IDE.
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>
+"""
+
+from PyQt5 import QtGui, QtCore, QtWidgets
 from model.syntax import Highlighter
 import re
 import json
@@ -7,7 +24,7 @@
 
 class MyTextEdit(QtWidgets.QPlainTextEdit):
 
-    def __init__(self,*args):
+    def __init__(self, *args):
         #*args to set parent
         QtWidgets.QLineEdit.__init__(self,*args)
         font=QtGui.QFont()
diff --git a/model/SaveNode.py b/model/SaveNode.py
@@ -1,3 +1,20 @@
+"""
+    Brick is lightweight IDE for C programming language.
+    Copyright (C) 2020 : Mršulja Ivan
+
+    This file is part of Brick IDE.
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>
+"""
+
 class SaveNode(object):
     def __init__(self, path):
         self.data = ""
@@ -8,5 +25,3 @@ def save(self):
         with open(self.path, "w") as file:
             file.write(self.data)
 
-    def get_data(self):
-        return self._data
diff --git a/model/Terminal.py b/model/Terminal.py
@@ -1,7 +1,7 @@
 """
     i386ide is lightweight IDE for i386 assembly and C programming language.
     Copyright (C) 2019  Dušan Erdeljan, Marko Njegomir
-    Redistributed by: Mrsulja Ivan
+    Redistributed by: Mršulja Ivan
 
     This file is part of i386ide.
     This program is free software: you can redistribute it and/or modify
diff --git a/model/syntax.py b/model/syntax.py
@@ -1,3 +1,20 @@
+"""
+    Brick is lightweight IDE for C programming language.
+    Copyright (C) 2020 : Mršulja Ivan
+
+    This file is part of Brick IDE.
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>
+"""
+
 from PyQt5.QtCore import QFile, QRegExp, Qt
 from PyQt5.QtGui import QFont, QSyntaxHighlighter, QTextCharFormat, QColor
 from PyQt5.QtWidgets import (QApplication, QFileDialog, QMainWindow, QMenu,
diff --git a/structures/CommandHistoryStack.py b/structures/CommandHistoryStack.py
@@ -1,6 +1,7 @@
 """
     i386ide is lightweight IDE for i386 assembly and C programming language.
     Copyright (C) 2019  Dušan Erdeljan, Marko Njegomir
+    Redistributed by: Mršulja Ivan
 
     This file is part of i386ide.
     This program is free software: you can redistribute it and/or modify
diff --git a/viewer/CompilationDialog.py b/viewer/CompilationDialog.py
@@ -1,3 +1,20 @@
+"""
+    Brick is lightweight IDE for C programming language.
+    Copyright (C) 2020 : Mršulja Ivan
+
+    This file is part of Brick IDE.
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>
+"""
+
 from PyQt5 import QtWidgets
 import os
 
@@ -59,9 +76,11 @@ def compile_c(self):
         print(full_path)
         self.window.name = os.path.split(self.window.form.save_path)[1]
         command = "gcc -g " + full_path + " -o '" + self.window.name + "'"
-        print(command)
-        os.system(command)
-        self.window.status_label.setText("Compiled successfully !")
+        if self.window.form.terminal.executeCommand(command):
+            self.window.status_label.setText("Compiled successfully !")
+        else:
+            self.window.status_label.setText("Compilation terminated.")
+            self.window.name = None
         self.close()
 
 
diff --git a/viewer/NumberBar.py b/viewer/NumberBar.py
@@ -0,0 +1,114 @@
+from PyQt5.Qt import QFrame, QWidget, QHBoxLayout, QPainter, QPlainTextEdit, QFont
+from PyQt5 import QtWidgets
+import sys
+
+
+
+class NumberBar(QWidget):
+
+    def __init__(self, *args):
+        QWidget.__init__(self, *args)
+        self.edit = None
+        # This is used to update the width of the control.
+        # It is the highest line that is currently visibile.
+        self.highest_line = 0
+
+    def setTextEdit(self, edit):
+        self.edit = edit
+
+    def update(self, *args):
+        '''
+        Updates the number bar to display the current set of numbers.
+        Also, adjusts the width of the number bar if necessary.
+        '''
+        # The + 4 is used to compensate for the current line being bold.
+        width = self.fontMetrics().width(str(self.highest_line)) + 4
+        if self.width() != width:
+            self.setFixedWidth(width)
+        QWidget.update(self, *args)
+
+    def paintEvent(self, event):
+        contents_y = self.edit.verticalScrollBar().value()
+        page_bottom = contents_y + self.edit.viewport().height()
+        font_metrics = self.fontMetrics()
+        current_block = self.edit.document().findBlock(self.edit.textCursor().position())
+
+        painter = QPainter(self)
+
+        line_count = 0
+        # Iterate over all text blocks in the document.
+        block = self.edit.document().begin()
+        while block.isValid():
+            line_count += 1
+
+            # The top left position of the block in the document
+            position = self.edit.document().documentLayout().blockBoundingRect(block).topLeft()
+
+            # Check if the position of the block is out side of the visible
+            # area.
+            if position.y() > page_bottom:
+                break
+
+            # We want the line number for the selected line to be bold.
+            bold = False
+            if block == current_block:
+                bold = True
+                font = painter.font()
+                font.setBold(True)
+                painter.setFont(font)
+
+            # Draw the line number right justified at the y position of the
+            # line. 3 is a magic padding number. drawText(x, y, text).
+            font = QFont()
+            font.setPointSize(self.edit.font().pointSize())
+            font.setWordSpacing(20)
+            painter.setFont(font)
+            if line_count == 1:
+                painter.drawText(self.width() - font_metrics.width(str(line_count)) - 3, 1 + 17 * line_count, str(line_count))
+            else:
+                painter.drawText(self.width() - font_metrics.width(str(line_count)) - 3,
+                                 1 + 17 * line_count + (self.edit.font().pointSize() - 10) * line_count * 2,
+                                 str(line_count))
+            #print(self.width() - font_metrics.width(str(line_count)) - 3 , " " , round(position.y()) - contents_y + font_metrics.ascent(), str(line_count))
+
+            # Remove the bold style if it was set previously.
+            if bold:
+                font = painter.font()
+                font.setBold(False)
+                painter.setFont(font)
+
+            block = block.next()
+
+        self.highest_line = line_count
+        painter.end()
+
+        QWidget.paintEvent(self, event)
+
+
+class TestWidget(QtWidgets.QWidget):
+    def __init__(self):
+        super(TestWidget, self).__init__()
+        #window = LineTextWidget()
+        self.edit = QPlainTextEdit()
+        self.number_bar = NumberBar()
+        self.number_bar.setTextEdit(self.edit)
+        l = QHBoxLayout()
+        l.addWidget(self.number_bar)
+        l.addWidget(self.edit)
+        self.setLayout(l)
+        self.edit.installEventFilter(self)
+        self.edit.viewport().installEventFilter(self)
+        self.show()
+
+    def eventFilter(self, object, event):
+        # Update the line numbers for all events on the text edit and the viewport.
+        # This is easier than connecting all necessary singals.
+        if object in (self.edit, self.edit.viewport()):
+            self.number_bar.update()
+            return False
+        return QFrame.eventFilter(object, event)
+
+if __name__ == '__main__':
+    app = QtWidgets.QApplication(sys.argv)
+    wind = TestWidget()
+    sys.exit(app.exec_())
diff --git a/viewer/editor.py b/viewer/editor.py
@@ -1,10 +1,29 @@
+"""
+    Brick is lightweight IDE for C programming language.
+    Copyright (C) 2020 : Mršulja Ivan
+
+    This file is part of Brick IDE.
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>
+"""
+
 import shutil
 from model.SaveNode import *
 from PyQt5.QtCore import Qt, pyqtRemoveInputHook
+from PyQt5.Qt import QFrame
 import os
 import qdarkstyle
 from model.Terminal import Terminal
 from model.Autocompleter import *
+from viewer.NumberBar import NumberBar
 
 
 class TextEditor(QtWidgets.QWidget):
@@ -37,9 +56,12 @@ def init_ui(self):
         self.tree.doubleClicked.connect(self.tree_clk)
         self.get_open_path()
         self.init_text_edit()
+        self.text_edit_layout = QtWidgets.QHBoxLayout()
+        self.text_edit_layout.addWidget(self.number_bar)
+        self.text_edit_layout.addWidget(self.text)
 
         self.grid = QtWidgets.QGridLayout()
-        self.grid.addWidget(self.text, 0, 2, 4, 6)
+        self.grid.addLayout(self.text_edit_layout, 0, 2, 4, 6)
         self.grid.addWidget(self.tree, 0, 0, 4, 2)
         self.grid.addWidget(self.terminal, 4, 0, 2, 8)
 
@@ -60,10 +82,14 @@ def open_menu(self, position):
         action_refresh = QtWidgets.QAction("Refresh", None)
         action_refresh.triggered.connect(self.refresh_table)
 
+        action_rename = QtWidgets.QAction("Rename", None)
+        action_rename.triggered.connect(self.rename_node)
+
         if self.tree.currentIndex().internalPointer() is not None:
             self.contextMenu.addAction(actionNewFolder)
             self.contextMenu.addAction(actionNewFile)
             self.contextMenu.addAction(action_delete)
+            self.contextMenu.addAction(action_rename)
             self.contextMenu.addAction(action_refresh)
 
 
@@ -91,6 +117,16 @@ def delete_node(self):
                 os.remove(del_path)
             self.refresh_table()
 
+    def rename_node(self):
+        ret_text, ok_button = QtWidgets.QInputDialog.getText(self, "Rename", "Insert new name: ")
+        if ok_button:
+            if ret_text.strip() == "":
+                QtWidgets.QMessageBox.critical(self, "Error", "Empty directory name! ")
+                return
+            path = self.get_path_for_making(self.open_path)
+            os.rename(path, os.path.join(os.path.split(path)[0], ret_text))
+            self.tree.repaint()
+
     def make_new_folder(self):
         base_path = self.open_path
         if self.tree.currentIndex().parent() != self.tree.rootIndex() or not "." in self.tree.currentIndex().data():
@@ -132,6 +168,9 @@ def init_text_edit(self):
         self.text.setCompleter(self.completer)
         self.text.setStyleSheet("QPlainTextEdit { color: rgb(169, 183, 198) }")
 
+        self.number_bar = NumberBar()
+        self.number_bar.setTextEdit(self.text)
+
         self.font = QtGui.QFont()
         self.font.setFamily('Ariel')
         self.font.setFixedPitch(True)
@@ -153,6 +192,17 @@ def init_text_edit(self):
         new_completer = check_for_header_files(self.text.toPlainText(), self.completer.my_keywords)
         self.text.setCompleter(new_completer)
 
+        self.text.installEventFilter(self)
+        self.text.viewport().installEventFilter(self)
+
+    def eventFilter(self, object, event):
+        # Update the line numbers for all events on the text edit and the viewport.
+        # This is easier than connecting all necessary singals.
+        if object in (self.text, self.text.viewport()):
+            self.number_bar.update()
+            return False
+        return QFrame.eventFilter(object, event)
+
     def set_font(self, value):
         if int(value) >= 8 and int(value) <= 50:
             self.font.setPointSize(int(value))
diff --git a/viewer/main.py b/viewer/main.py
