Use asm.cmt.col = 60 by default

Makefile

@@ -79,6 +79,8 @@ else
 	$(MAKE) -C build install INSTALL_ROOT=$(DESTDIR)
 endif
 	$(MAKE) -C src/translations install
+	mkdir -p "$(DESTDIR)/$(PREFIX)/share/iaito/translations"
+	cp -f src/translations/build/*.qm "$(DESTDIR)/$(PREFIX)/share/iaito/translations"
 
 user-install:
 

autogen.sh

@@ -21,6 +21,17 @@ else
 	echo "Running acr..."
 	acr -p
 fi
+
+. configure
+
+sed \
+	-e "s,^IAITO_VERSION_MAJOR.*,IAITO_VERSION_MAJOR = ${VERSION_MAJOR}," \
+	-e "s,^IAITO_VERSION_MINOR.*,IAITO_VERSION_MINOR = ${VERSION_MINOR}," \
+	-e "s,^IAITO_VERSION_PATCH.*,IAITO_VERSION_PATCH = ${VERSION_PATCH}," \
+< src/Iaito.pro > src/Iaito.pro.sed
+
+mv src/Iaito.pro.sed src/Iaito.pro
+
 #V=`./configure -qV | cut -d - -f -1`
 # meson rewrite kwargs set project / version "$V"
 # if [ -n "$1" ]; then

configure

@@ -112,12 +112,12 @@ done
 : ${INSTALL_PROGRAM_STRIP:=${INSTALL} -m 755 -s}
 : ${INSTALL_MAN:=${INSTALL} -m 444}
 : ${INSTALL_LIB:=${INSTALL} -m 755 -c}
- PKGNAME='iaito' ; VERSION='5.2.1' ; VERSION_MAJOR=5; VERSION_MINOR=2; VERSION_PATCH=1; VERSION_NUMBER=50201; CONTACT_MAIL="[email protected]" ; CONTACT_NAME="pancake" ; CONTACT="pancake <[email protected]>" ;
+ PKGNAME='iaito' ; VERSION='5.2.2' ; VERSION_MAJOR=5; VERSION_MINOR=2; VERSION_PATCH=2; VERSION_NUMBER=50202; CONTACT_MAIL="[email protected]" ; CONTACT_NAME="pancake" ; CONTACT="pancake <[email protected]>" ;
 }
 
 show_usage() {
 cat <<EOF2
-'configure' configures iaito-5.2.1 to adapt to many kinds of systems.
+'configure' configures iaito-5.2.2 to adapt to many kinds of systems.
 
 Usage: ./configure [OPTION]... [VAR=VALUE]...
 
@@ -196,10 +196,10 @@ ocho() {
 
 show_version() {
 if [ "$QUIET" = 1 ]; then
-	echo "5.2.1"
+	echo "5.2.2"
 	exit 0
 fi
-echo "iaito-5.2.1 configuration script done with acr v1.9.8.
+echo "iaito-5.2.2 configuration script done with acr v1.9.8.
 The 'Free Software Foundation' message is only for autodetection.
 Originally written by pancake <nopcode.org>."
 exit 0
@@ -228,7 +228,7 @@ case $flag in
 	show_version ; ;;
 -r|--r|--report)
 echo "PKGNAME:   iaito"
-echo "VERSION:   5.2.1"
+echo "VERSION:   5.2.2"
 echo "LANGS:     c++"
 echo "PKG-CONFIG:  r_core"
 echo "FLAGS:     --with-python --with-python-bindings --with-crash-reports"

configure.acr

@@ -1,5 +1,5 @@
 PKGNAME iaito
-VERSION 5.2.1
+VERSION 5.2.2
 CONTACT pancake ; [email protected]
 
 LANG_CXX!

dist/macos/make-macos-pkg.sh

@@ -13,7 +13,7 @@ if [ -n "$1" ]; then
 	VERSION="$1"
 else
 	VERSION="`../../configure -qV`"
-	[ -z "${VERSION}" ] && VERSION=5.2.1
+	[ -z "${VERSION}" ] && VERSION=5.2.2
 fi
 [ -z "${MAKE}" ] && MAKE=make
 

src/Iaito.pro

@@ -4,7 +4,7 @@ TARGET = iaito
 
 IAITO_VERSION_MAJOR = 5
 IAITO_VERSION_MINOR = 2
-IAITO_VERSION_PATCH = 1
+IAITO_VERSION_PATCH = 2
 
 CONFIG += sdk_no_version_check
 

src/IaitoApplication.cpp

@@ -55,12 +55,15 @@ IaitoApplication::IaitoApplication(int &argc, char **argv) : QApplication(argc,
     }
 
     // Load fonts
-    int ret = QFontDatabase::addApplicationFont(":/fonts/Anonymous Pro.ttf");
+    int ret = QFontDatabase::addApplicationFont(":/fonts/AgaveRegular.ttf");
+    if (ret == -1) {
+        qWarning() << "Cannot load Agave Regular font.";
+    }
+    ret = QFontDatabase::addApplicationFont(":/fonts/AnonymousPro.ttf");
     if (ret == -1) {
         qWarning() << "Cannot load Anonymous Pro font.";
     }
-
-    ret = QFontDatabase::addApplicationFont(":/fonts/Inconsolata-Regular.ttf");
+    ret = QFontDatabase::addApplicationFont(":/fonts/InconsolataRegular.ttf");
     if (ret == -1) {
         qWarning() << "Cannot load Incosolata-Regular font.";
     }

src/common/AsyncTask.cpp

@@ -84,7 +84,9 @@ void AsyncTaskManager::start(AsyncTask::Ptr task)
         tasks.removeOne(weakPtr);
         emit tasksChanged();
     });
+#if QT_VERSION >= 0x050a00
     threadPool->setStackSize(R2THREAD_STACK_SIZE);
+#endif
     threadPool->start(task.data());
     emit tasksChanged();
 }

src/common/Configuration.cpp

@@ -129,7 +129,7 @@ static const QHash<QString, QVariant> asmOptions = {
     { "asm.emu",            false },
     { "emu.str",            true},
     { "asm.cmt.right",      true },
-    { "asm.cmt.col",        35 },
+    { "asm.cmt.col",        60 },
     { "asm.var.summary",    false },
     { "asm.bytes",          false },
     { "asm.size",           false },

src/common/ResourcePaths.cpp

@@ -78,11 +78,18 @@ QStringList Iaito::getTranslationsDirectories()
 {
     auto result = locateAll(QStandardPaths::DataLocation, "translations",
                             QStandardPaths::LocateDirectory);
+    // loading from iaito home
     char *home = r_str_home(".local/share/iaito/translations");
     result << home;
+    printf ("Loading translations path %s\n", home);
     free (home);
-    result << QLibraryInfo::location(QLibraryInfo::TranslationsPath);
-    // printf ("Using transpath %s %c", result[0].toStdString().c_str(), 10);
+    // loading from system
+    result << "/usr/local/share/iaito/translations";
+    result << "/usr/share/iaito/translations";
+    // loading from qt
+    auto qtpath = QLibraryInfo::location(QLibraryInfo::TranslationsPath);
+    result << qtpath;
+    printf ("Loading translations path %s\n", qtpath.toStdString().c_str());
     return result;
 }
 

src/org.radare.iaito.appdata.xml

@@ -22,10 +22,13 @@
   </screenshots>
 
   <url type="homepage">https://www.radare.org/</url>
-  <update_contact>xarkes</update_contact>
+  <update_contact>pancake</update_contact>
 
   <releases>
+    <release version="5.2.2" date="2021-04-27" />
     <release version="5.2.1" date="2021-04-21" />
+    <release version="5.2.0" date="2021-04-16" />
+    <release version="5.1.0" date="2021-01-31" />
     <release version="1.12.0" date="2020-09-03" />
     <release version="1.11.0" date="2020-07-24" />
     <release version="1.10.3" date="2020-05-08" />

src/plugins/PluginManager.cpp

@@ -3,7 +3,7 @@
 
 #ifdef IAITO_ENABLE_PYTHON_BINDINGS
 #include <Python.h>
-#include <cutterbindings_python.h>
+#include <iaitobindings_python.h>
 #include "PythonManager.h"
 #endif
 
@@ -220,7 +220,7 @@ IaitoPlugin *PluginManager::loadPythonPlugin(const char *moduleName)
         return nullptr;
     }
 
-    PythonToCppFunc pythonToCpp = Shiboken::Conversions::isPythonToCppPointerConvertible(reinterpret_cast<SbkObjectType *>(SbkIaitoBindingsTypes[SBK_CUTTERPLUGIN_IDX]), pluginObject);
+    PythonToCppFunc pythonToCpp = Shiboken::Conversions::isPythonToCppPointerConvertible(reinterpret_cast<SbkObjectType *>(SbkIaitoBindingsTypes[SBK_IAITOPLUGIN_IDX]), pluginObject);
     if (!pythonToCpp) {
         qWarning() << "Plugin's create_cutter_plugin() function did not return an instance of IaitoPlugin:" << QString(moduleName);
         return nullptr;

src/plugins/sample-cpp/IaitoSamplePlugin.h

@@ -16,7 +16,7 @@ public:
     void setupInterface(MainWindow *main) override;
 
     QString getName() const override          { return "SamplePlugin"; }
-    QString getAuthor() const override        { return "xarkes"; }
+    QString getAuthor() const override        { return "someone"; }
     QString getDescription() const override   { return "Just a sample plugin."; }
     QString getVersion() const override       { return "1.0"; }
 };

src/resources.qrc

@@ -88,8 +88,9 @@
         <file>img/icons/spin_light.svg</file>
         <file>img/icons/import_light.svg</file>
         <file>img/icons/home.svg</file>
-        <file>fonts/Anonymous Pro.ttf</file>
-        <file>fonts/Inconsolata-Regular.ttf</file>
+        <file>fonts/AnonymousPro.ttf</file>
+        <file>fonts/AgaveRegular.ttf</file>
+        <file>fonts/InconsolataRegular.ttf</file>
         <file>img/cutter_plain.svg</file>
         <file>img/cutter_white_plain.svg</file>
         <file>img/iaito-o.svg</file>