Renamed sigrok-qt2 to PulseView

diff --git a/.gitignore b/.gitignore
index 9daf758c0293c7040e97580f533a560ef3cb1078..6520b8f328231dcf52fca30888c7fa98f5e4b2e2 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
-sigrok-qt2
-sigrok-qt2-test
+pulseview
+pulseview-test

 
 # CMake cruft
 CMakeCache.txt
 
 # CMake cruft
 CMakeCache.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2d62dfcbe1bee3da5b63da4d5ed9381e3401e6b4..eda85202ee39d6087ef6b1abb61b190fcff077a6 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 2.6)
 include(FindPkgConfig)
 
 cmake_minimum_required(VERSION 2.6)
 include(FindPkgConfig)
 

-project(sigrok-qt2)
+project(pulseview)

 
 find_package(PkgConfig)
 pkg_check_modules(PKGDEPS REQUIRED
 
 find_package(PkgConfig)
 pkg_check_modules(PKGDEPS REQUIRED


@@ -14,7 +14,7 @@ find_package(Boost 1.46 COMPONENTS unit_test_framework REQUIRED)
 
 set(VERSION 0.1.0)
 
 
 set(VERSION 0.1.0)
 

-set(sigrok-qt2_SOURCES
+set(pulseview_SOURCES

        about.cpp
        datasnapshot.cpp
        logicdata.cpp
        about.cpp
        datasnapshot.cpp
        logicdata.cpp


@@ -29,7 +29,7 @@ set(sigrok-qt2_SOURCES
        sigview.cpp
 )
 
        sigview.cpp
 )
 

-set(sigrok-qt2_HEADERS
+set(pulseview_HEADERS

        about.h
        mainwindow.h
        samplingbar.h
        about.h
        mainwindow.h
        samplingbar.h


@@ -37,15 +37,15 @@ set(sigrok-qt2_HEADERS
        sigview.h
 )
 
        sigview.h
 )
 

-set(sigrok-qt2_FORMS
+set(pulseview_FORMS

        about.ui
 )
 
        about.ui
 )
 

-set(sigrok-qt2_RESOURCES
-       sigrok-qt2.qrc
+set(pulseview_RESOURCES
+       pulseview.qrc

 )
 
 )
 

-set(sigrok-qt2_TEST_SOURCES
+set(pulseview_TEST_SOURCES

        test/logicdatasnapshot.cpp
        test/test.cpp
        datasnapshot.cpp
        test/logicdatasnapshot.cpp
        test/test.cpp
        datasnapshot.cpp


@@ -54,9 +54,9 @@ set(sigrok-qt2_TEST_SOURCES
 
 set(QT_USE_QTOPENGL TRUE)
 
 
 set(QT_USE_QTOPENGL TRUE)
 

-qt4_wrap_cpp(sigrok-qt2_HEADERS_MOC ${sigrok-qt2_HEADERS})
-qt4_wrap_ui(sigrok-qt2_FORMS_HEADERS ${sigrok-qt2_FORMS})
-qt4_add_resources(sigrok-qt2_RESOURCES_RCC ${sigrok-qt2_RESOURCES})
+qt4_wrap_cpp(pulseview_HEADERS_MOC ${pulseview_HEADERS})
+qt4_wrap_ui(pulseview_FORMS_HEADERS ${pulseview_FORMS})
+qt4_add_resources(pulseview_RESOURCES_RCC ${pulseview_RESOURCES})

 
 include(${QT_USE_FILE})
 
 
 include(${QT_USE_FILE})
 


@@ -74,14 +74,14 @@ link_directories(
        ${PKGDEPS_LIBRARY_DIRS}
 )
 
        ${PKGDEPS_LIBRARY_DIRS}
 )
 

-add_executable(sigrok-qt2
-       ${sigrok-qt2_SOURCES}
-       ${sigrok-qt2_HEADERS_MOC}
-       ${sigrok-qt2_FORMS_HEADERS}
-       ${sigrok-qt2_RESOURCES_RCC}
+add_executable(pulseview
+       ${pulseview_SOURCES}
+       ${pulseview_HEADERS_MOC}
+       ${pulseview_FORMS_HEADERS}
+       ${pulseview_RESOURCES_RCC}

 )
 
 )
 

-target_link_libraries(sigrok-qt2
+target_link_libraries(pulseview

        ${Boost_LIBRARIES}
        ${PKGDEPS_LIBRARIES}
        ${QT_LIBRARIES}
        ${Boost_LIBRARIES}
        ${PKGDEPS_LIBRARIES}
        ${QT_LIBRARIES}


@@ -89,15 +89,15 @@ target_link_libraries(sigrok-qt2
 
 add_definitions(-DBOOST_TEST_DYN_LINK)
 
 
 add_definitions(-DBOOST_TEST_DYN_LINK)
 

-add_executable(sigrok-qt2-test
-       ${sigrok-qt2_TEST_SOURCES}
+add_executable(pulseview-test
+       ${pulseview_TEST_SOURCES}

 )
 
 )
 

-target_link_libraries(sigrok-qt2-test
+target_link_libraries(pulseview-test

        ${Boost_LIBRARIES}
        ${PKGDEPS_LIBRARIES}
        ${QT_LIBRARIES}
 )
 
 enable_testing()
        ${Boost_LIBRARIES}
        ${PKGDEPS_LIBRARIES}
        ${QT_LIBRARIES}
 )
 
 enable_testing()

-add_test(test ${CMAKE_CURRENT_BINARY_DIR}/sigrok-qt2-test)
+add_test(test ${CMAKE_CURRENT_BINARY_DIR}/pulseview-test)

diff --git a/about.ui b/about.ui
index 7fa9f9b496f43bd6d416e881ad7b088ca8d6e3a1..10163f9afa9e01b1be23a2a8194aab745e5b5f77 100644 (file)
--- a/about.ui
+++ b/about.ui
@@ -28,7 +28,7 @@
         <string/>
        </property>
        <property name="pixmap">
         <string/>
        </property>
        <property name="pixmap">

-        <pixmap resource="sigrok-qt2.qrc">:/icons/sigrok-logo-notext.png</pixmap>
+        <pixmap resource="pulseview.qrc">:/icons/sigrok-logo-notext.png</pixmap>

        </property>
       </widget>
      </item>
        </property>
       </widget>
      </item>


@@ -57,7 +57,7 @@
   </layout>
  </widget>
  <resources>
   </layout>
  </widget>
  <resources>

-  <include location="sigrok-qt2.qrc"/>
+  <include location="pulseview.qrc"/>

  </resources>
  <connections>
   <connection>
  </resources>
  <connections>
   <connection>

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 5ecc14d11c995990ecde6325c6aa2ecb903e352d..54cc39ecea17cfe9d0fc412981d40e62f5db1fd0 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -126,7 +126,9 @@ void MainWindow::setup_ui()
        _status_bar = new QStatusBar(this);
        setStatusBar(_status_bar);
 
        _status_bar = new QStatusBar(this);
        setStatusBar(_status_bar);
 

-       setWindowTitle(QApplication::translate("MainWindow", "sigrok-qt2", 0, QApplication::UnicodeUTF8));
+       setWindowTitle(QApplication::translate("MainWindow", "PulseView", 0,
+               QApplication::UnicodeUTF8));
+

        _action_open->setText(QApplication::translate("MainWindow", "&Open...", 0, QApplication::UnicodeUTF8));
        _action_view_zoom_in->setText(QApplication::translate("MainWindow", "Zoom &In", 0, QApplication::UnicodeUTF8));
        _action_view_zoom_out->setText(QApplication::translate("MainWindow", "Zoom &Out", 0, QApplication::UnicodeUTF8));
        _action_open->setText(QApplication::translate("MainWindow", "&Open...", 0, QApplication::UnicodeUTF8));
        _action_view_zoom_in->setText(QApplication::translate("MainWindow", "Zoom &In", 0, QApplication::UnicodeUTF8));
        _action_view_zoom_out->setText(QApplication::translate("MainWindow", "Zoom &Out", 0, QApplication::UnicodeUTF8));

diff --git a/pulseview.qrc b/pulseview.qrc
new file mode 100644 (file)
index 0000000..c94ab73
--- /dev/null
+++ b/pulseview.qrc
@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/" >
+        <file>icons/sigrok-logo-notext.png</file>
+    </qresource>
+</RCC>

diff --git a/sigrok-qt2.qrc b/sigrok-qt2.qrc
deleted file mode 100644 (file)
index c94ab73..0000000
--- a/sigrok-qt2.qrc
+++ /dev/null
@@ -1,5 +0,0 @@
-<RCC>
-    <qresource prefix="/" >
-        <file>icons/sigrok-logo-notext.png</file>
-    </qresource>
-</RCC>