Changeset - d9497a51e102
Parent rev.
Child rev.
[Not reviewed]
command-panel
0 4 4
Hasan Yavuz ÖZDERYA - 10 years ago 2015-10-18 05:25:50
hy@ozderya.net
added list-add and list-remove icons (from Tango icon project) for windows
8 files changed with 29 insertions and 4 deletions:
CMakeLists.txt
6
1
commandpanel.cpp
4
commandwidget.cpp
5
1
misc/tango/license_notice
3
misc/tango/list-add.png
bin+new file
misc/tango/list-remove.png
bin+new file
misc/winicons.qrc
6
serialplot.pro
5
2
0 comments (0 inline, 0 general)
CMakeLists.txt
➞
Show inline comments
 
@@ -60,7 +60,12 @@ qt5_wrap_ui(UI_FILES
 
  commandpanel.ui
 
  commandwidget.ui
 
  )
 
qt5_add_resources(RES_FILES misc/icons.qrc)
 

			




	
	
	
		
 
if (WIN32)

			




	
	
	
		
 
  qt5_add_resources(RES_FILES misc/icons.qrc misc/winicons.qrc)

			




	
	
	
		
 
else (WIN32)

			




	
	
	
		
 
  qt5_add_resources(RES_FILES misc/icons.qrc)

			




	
	
	
		
 
endif (WIN32)

			




	
	
	
		
 

			




	
	
	
		
 
add_executable(${PROGRAM_NAME} WIN32

			




	
	
	
		
 
  main.cpp

			




        

    


    
    

    

        

                

                    commandpanel.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -32,6 +32,10 @@ CommandPanel::CommandPanel(QSerialPort* 

			




	
	
	
		
 
    ui->setupUi(this);

			




	
	
	
		
 
    ui->scrollAreaWidgetContents->setLayout(new QVBoxLayout);

			




	
	
	
		
 

			




	
	
	
		
 
#ifdef Q_OS_WIN

			




	
	
	
		
 
    ui->pbNew->setIcon(QIcon(":/icons/list-add"));

			




	
	
	
		
 
#endif // Q_OS_WIN

			




	
	
	
		
 

			




	
	
	
		
 
    connect(ui->pbNew, &QPushButton::clicked, this, &CommandPanel::newCommand);

			




	
	
	
		
 

			




	
	
	
		
 
    newCommand(); // add an empty slot by default

			




        

    


    
    

    

        

                

                    commandwidget.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -22,8 +22,8 @@

			




	
	
	
		
 

			




	
	
	
		
 
#include <QRegExp>

			




	
	
	
		
 
#include <QRegExpValidator>

			




	
	
	
		
 

			




	
	
	
		
 
#include <QtDebug>

			




	
	
	
		
 
#include <QIcon>

			




	
	
	
		
 

			




	
	
	
		
 
CommandWidget::CommandWidget(QWidget *parent) :

			




	
	
	
		
 
    QWidget(parent),

			




	
	
		
 
@@ -31,6 +31,10 @@ CommandWidget::CommandWidget(QWidget *pa

			




	
	
	
		
 
{

			




	
	
	
		
 
    ui->setupUi(this);

			




	
	
	
		
 

			




	
	
	
		
 
#ifdef Q_OS_WIN

			




	
	
	
		
 
    ui->pbDelete->setIcon(QIcon(":/icons/list-remove"));

			




	
	
	
		
 
#endif // Q_OS_WIN

			




	
	
	
		
 

			




	
	
	
		
 
    connect(ui->pbDelete, &QPushButton::clicked, this, &CommandWidget::onDeleteClicked);

			




	
	
	
		
 
    connect(ui->pbSend, &QPushButton::clicked, this, &CommandWidget::onSendClicked);

			




	
	
	
		
 
    connect(ui->pbASCII, &QPushButton::toggled, this, &CommandWidget::onASCIIToggled);

			




        

    


    
    

    

        

                

                    misc/tango/license_notice
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
new file 100644

			




	
	
	
		
 
Icon files in this directory are taken from Tango project

			




	
	
	
		
 
(http://tango.freedesktop.org/). Please see referenced web page for

			




	
	
	
		
 
more information.

			




	
	
		
 
\ No newline at end of file

			




        

    


    
    

    

        

                

                    misc/tango/list-add.png
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
new file 100644

			




	
	
		
 
binary diff not shown

			




              
Show images

              

              

        

    


    
    

    

        

                

                    misc/tango/list-remove.png
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
new file 100644

			




	
	
		
 
binary diff not shown

			




              
Show images

              

              

        

    


    
    

    

        

                

                    misc/winicons.qrc
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
new file 100644

			




	
	
	
		
 
<RCC>

			




	
	
	
		
 
    <qresource prefix="/icons">

			




	
	
	
		
 
        <file alias="list-add">tango/list-add.png</file>

			




	
	
	
		
 
        <file alias="list-remove">tango/list-remove.png</file>

			




	
	
	
		
 
    </qresource>

			




	
	
	
		
 
</RCC>

			




        

    


    
    

    

        

                

                    serialplot.pro
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -81,5 +81,8 @@ INCLUDEPATH += qmake/

			




	
	
	
		
 

			




	
	
	
		
 
CONFIG += c++11

			




	
	
	
		
 

			




	
	
	
		
 
RESOURCES += \

			




	
	
	
		
 
    misc/icons.qrc

			




	
	
	
		
 
RESOURCES += misc/icons.qrc

			




	
	
	
		
 

			




	
	
	
		
 
win32 {

			




	
	
	
		
 
    RESOURCES += misc/winicons.qrc

			




	
	
	
		
 
}

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: zserverv-307515
    
    
        This site is powered by
            Kallithea,
        which is
        © 2010–2021 by various authors & licensed under GPLv3.
            – Support