rizinorg · XVilka · May 14, 2023 · May 4, 2023 · May 4, 2023 · May 4, 2023
diff --git a/rizin b/rizin
diff --git a/src/common/Configuration.cpp b/src/common/Configuration.cpp
@@ -143,8 +143,8 @@ Configuration::Configuration() : QObject(), nativePalette(qApp->palette())
     mPtr = this;
     if (!s.isWritable()) {
         QMessageBox::critical(
-                nullptr, tr("Critical!"),
-                tr("!!! Settings are not writable! Make sure you have a write access to \"%1\"")
+                nullptr, tr("Critical Error!"),
+                tr("Settings are not writable! Make sure you have a write access to \"%1\".")
                         .arg(s.fileName()));
     }
 #ifdef CUTTER_ENABLE_KSYNTAXHIGHLIGHTING

diff --git a/src/common/DisassemblyPreview.cpp b/src/common/DisassemblyPreview.cpp
@@ -44,13 +44,6 @@ bool DisassemblyPreview::showDisasPreview(QWidget *parent, const QPoint &pointOf
         }
 
         RVA offsetTo = refs.at(0).to; // This is the offset we want to preview
-
-        if (Q_UNLIKELY(offsetFrom != refs.at(0).from)) {
-            qWarning() << QObject::tr("offsetFrom (%1) differs from refs.at(0).from (%(2))")
-                                  .arg(offsetFrom)
-                                  .arg(refs.at(0).from);
-        }
-
         /*
          * Only if the offset we point *to* is different from the one the cursor is currently
          * on *and* the former is a valid offset, we are allowed to get a preview of offsetTo

diff --git a/src/common/IOModesController.cpp b/src/common/IOModesController.cpp
@@ -91,7 +91,7 @@ bool IOModesController::askCommitUnsavedChanges()
     // Check if there are uncommitted changes
     if (!allChangesComitted()) {
         QMessageBox::StandardButton ret = QMessageBox::question(
-                NULL, QObject::tr("Uncomitted changes"),
+                NULL, QObject::tr("Uncommitted changes"),
                 QObject::tr("It seems that you have changes or patches that are not committed to "
                             "the file.\n"
                             "Do you want to commit them now?"),

diff --git a/src/dialogs/InitialOptionsDialog.ui b/src/dialogs/InitialOptionsDialog.ui
@@ -323,7 +323,7 @@
            </size>
           </property>
           <property name="text">
-           <string>Auto Exp</string>
+           <string>Experimental</string>
           </property>
           <property name="alignment">
            <set>Qt::AlignCenter</set>

diff --git a/src/dialogs/MapFileDialog.cpp b/src/dialogs/MapFileDialog.cpp
@@ -33,7 +33,7 @@ void MapFileDialog::on_buttonBox_accepted()
     }
 
     if (!Core()->mapFile(filePath, mapAddress)) {
-        QMessageBox::critical(this, tr("Map new file file"), tr("Failed to map a new file"));
+        QMessageBox::critical(this, tr("Map new file"), tr("Failed to map a new file"));
         return;
     }
     close();

diff --git a/src/dialogs/NewFileDialog.cpp b/src/dialogs/NewFileDialog.cpp
@@ -287,7 +287,7 @@ void NewFileDialog::fillIOPluginsList()
 {
     ui->ioPlugin->clear();
     ui->ioPlugin->addItem("file://");
-    ui->ioPlugin->setItemData(0, tr("Open a file with no extra treatment."), Qt::ToolTipRole);
+    ui->ioPlugin->setItemData(0, tr("Open a file without additional options/settings."), Qt::ToolTipRole);
 
     int index = 1;
     QList<RzIOPluginDescription> ioPlugins = Core()->getRIOPluginDescriptions();

diff --git a/src/dialogs/preferences/AsmOptionsWidget.ui b/src/dialogs/preferences/AsmOptionsWidget.ui
@@ -142,7 +142,7 @@
                 <item row="17" column="1">
                  <widget class="QLabel" name="asmTabsOffLabel">
                   <property name="text">
-                   <string>Tabs before assembly (asm.tabs.off):</string>
+                   <string>The number of tabulate spaces after the offset (asm.tabs.off):</string>
                   </property>
                   <property name="textInteractionFlags">
                    <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
@@ -479,7 +479,7 @@
              <item>
               <widget class="QCheckBox" name="varsubCheckBox">
                <property name="text">
-                <string>Substitute variables (asm.sub.var)</string>
+                <string>Substitute variables in disassembly (asm.sub.var)</string>
                </property>
               </widget>
              </item>

diff --git a/src/menus/DisassemblyContextMenu.cpp b/src/menus/DisassemblyContextMenu.cpp
@@ -163,7 +163,7 @@ DisassemblyContextMenu::~DisassemblyContextMenu() {}
 
 void DisassemblyContextMenu::addSetBaseMenu()
 {
-    setBaseMenu = addMenu(tr("Set Immediate Base to..."));
+    setBaseMenu = addMenu(tr("Set base of immediate value to.."));
 
     initAction(&actionSetBaseBinary, tr("Binary"));
     setBaseMenu->addAction(&actionSetBaseBinary);

diff --git a/src/translations b/src/translations
diff --git a/src/widgets/ColorThemeListView.cpp b/src/widgets/ColorThemeListView.cpp
@@ -400,8 +400,7 @@ const QMap<QString, OptionInfo> optionInfoMap__ = {
     { "fname", { QObject::tr("Color of names of functions"), QObject::tr("Function name") } },
     { "floc", { QObject::tr("Color of function location"), QObject::tr("Function location") } },
     { "fline",
-      { QObject::tr(
-                "Color of ascii line in left side that shows what opcodes are belong to function"),
+      { QObject::tr("Color of the line which shows which opcodes belongs to a function"),
         QObject::tr("Function line") } },
     { "flag",
       { QObject::tr("Color of flags (similar to bookmarks for offset)"), QObject::tr("Flag") } },

diff --git a/src/widgets/DisassemblyWidget.cpp b/src/widgets/DisassemblyWidget.cpp
@@ -132,7 +132,7 @@ DisassemblyWidget::DisassemblyWidget(MainWindow *main)
     connect(Core(), &CutterCore::functionRenamed, this, [this]() { refreshDisasm(); });
     connect(Core(), SIGNAL(varsChanged()), this, SLOT(refreshDisasm()));
     connect(Core(), SIGNAL(asmOptionsChanged()), this, SLOT(refreshDisasm()));
-    connect(Core(), &CutterCore::instructionChanged, this, &DisassemblyWidget::refreshIfInRange);
+    connect(Core(), &CutterCore::instructionChanged, this, &DisassemblyWidget::instructionChanged);
     connect(Core(), &CutterCore::breakpointsChanged, this, &DisassemblyWidget::refreshIfInRange);
     connect(Core(), SIGNAL(refreshCodeViews()), this, SLOT(refreshDisasm()));
 
@@ -226,6 +226,12 @@ void DisassemblyWidget::refreshIfInRange(RVA offset)
     }
 }
 
+void DisassemblyWidget::instructionChanged(RVA offset)
+{
+    leftPanel->clearArrowFrom(offset);
+    refreshDisasm();
+}
+
 void DisassemblyWidget::refreshDisasm(RVA offset)
 {
     if (!disasmRefresh->attemptRefresh(offset == RVA_INVALID ? nullptr : new RVA(offset))) {
@@ -988,3 +994,12 @@ void DisassemblyLeftPanel::paintEvent(QPaintEvent *event)
 
     lastBeginOffset = lines.first().offset;
 }
+
+void DisassemblyLeftPanel::clearArrowFrom(RVA offset)
+{
+    auto it = std::find_if(arrows.begin(), arrows.end(),
+                           [&](const Arrow &it) { return it.jmpFromOffset() == offset; });
+    if (it != arrows.end()) {
+        arrows.erase(it);
+    }
+}
diff --git a/src/widgets/DisassemblyWidget.h b/src/widgets/DisassemblyWidget.h
@@ -53,6 +53,7 @@ public slots:
 protected slots:
     void on_seekChanged(RVA offset);
     void refreshIfInRange(RVA offset);
+    void instructionChanged(RVA offset);
     void refreshDisasm(RVA offset = RVA_INVALID);
 
     bool updateMaxLines();
@@ -153,6 +154,7 @@ class DisassemblyLeftPanel : public QFrame
     DisassemblyLeftPanel(DisassemblyWidget *disas);
     void paintEvent(QPaintEvent *event) override;
     void wheelEvent(QWheelEvent *event) override;
+    void clearArrowFrom(RVA offset);
 
 private:
     DisassemblyWidget *disas;

diff --git a/src/widgets/HexWidget.cpp b/src/widgets/HexWidget.cpp
@@ -160,7 +160,7 @@ HexWidget::HexWidget(QWidget *parent)
     connect(actionWriteCString, &QAction::triggered, this, &HexWidget::w_writeCString);
     actionsWriteString.append(actionWriteCString);
 
-    QAction *actionWrite64 = new QAction(tr("Write De\\Encoded Base64 string"), this);
+    QAction *actionWrite64 = new QAction(tr("Write a decoded or encoded Base64 string"), this);
     connect(actionWrite64, &QAction::triggered, this, &HexWidget::w_write64);
     actionsWriteString.append(actionWrite64);
 
@@ -1407,7 +1407,7 @@ void HexWidget::w_writeRandom()
     }
 
     bool ok = false;
-    int nbytes = QInputDialog::getInt(this, tr("Write random"), tr("Number of bytes:"), size, 1,
+    int nbytes = QInputDialog::getInt(this, tr("Write random bytes"), tr("Number of bytes:"), size, 1,
                                       0x7FFFFFFF, 1, &ok);
     if (!ok) {
         return;

diff --git a/src/widgets/RizinGraphWidget.cpp b/src/widgets/RizinGraphWidget.cpp
@@ -96,7 +96,7 @@ void GenericRizinGraphView::loadCurrentGraph()
         return;
     }
 
-    CutterJson functionsDoc = Core()->cmdj(QString("%1j").arg(graphCommand));
+    CutterJson functionsDoc = Core()->cmdj(QString("%1 json").arg(graphCommand));
     auto nodes = functionsDoc["nodes"];
 
     for (CutterJson block : nodes) {
+6 −1		.github/workflows/ci.yml
+2 −2		doc/examples/egg/simple.r
+10 −3		librz/debug/p/debug_gdb.c
+6 −3		librz/debug/p/debug_io.c
+13 −5		librz/debug/p/debug_native.c
+8 −6		librz/debug/p/native/linux/linux_coredump.c
+1 −2		librz/debug/p/native/linux/linux_debug.c
+3 −0		librz/include/rz_types_base.h
+1 −3		librz/include/sflib/darwin-arm-64/sfsyscall.h
+13 −5		librz/io/p/io_self.c
+7 −3		librz/reg/profile.c
+4 −2		librz/util/meson.build
+1 −1		meson.build
+1 −1		snapcraft.yaml
+227 −227		es-ES/cutter_es.ts
+7,600 −0		fi/cutter_fi.ts
+401 −401		fr/cutter_fr.ts
+1,400 −1,399		hi/cutter_hi.ts
+7 −7		it/cutter_it.ts
+893 −893		ja/cutter_ja.ts
+7,600 −0		pa-IN/cutter_pa.ts
+7,612 −0		pl/cutter_pl.ts
+109 −109		ru/cutter_ru.ts
+7,600 −0		sv-SE/cutter_sv.ts
+7,600 −0		sw/cutter_sw.ts
+7,594 −0		th/cutter_th.ts
+7,612 −0		uk/cutter_uk.ts
+7,600 −0		ur-IN/cutter_ur.ts
+7,600 −0		ur-PK/cutter_ur.ts
+7,594 −0		vi/cutter_vi.ts
+18 −18		zh-CN/cutter_zh.ts