* Theme now is simple and very fast

diff --git a/qml/LichViet/AmDateTimeDialog.qml b/qml/LichViet/AmDateTimeDialog.qml
index 83f05cd..2cafdd2 100644 (file)
--- a/qml/LichViet/AmDateTimeDialog.qml
+++ b/qml/LichViet/AmDateTimeDialog.qml
@@ -35,6 +35,7 @@ Item{
     }
 
     signal toolbar
     }
 
     signal toolbar

+    signal updatedate(int day, int month, int year)

 
     Rectangle {
         id: rectangle1
 
     Rectangle {
         id: rectangle1

@@ -51,8 +52,9 @@ Item{
 
         Button {
             id: button2
 
         Button {
             id: button2

-            x: 313
-            anchors.right: parent.right; anchors.rightMargin: 8; y: 185; width: 140; height: 40
+            anchors.right: parent.right; anchors.rightMargin: 145; y: 185; width: 100; height: 40
+            anchors.horizontalCenter: parent.horizontalCenter
+

             text: "OK"
             onClicked: {
                  var lday = lunarday_pathview.currentIndex+1;
             text: "OK"
             onClicked: {
                  var lday = lunarday_pathview.currentIndex+1;

@@ -76,15 +78,11 @@ Item{
                  if (thangnhuan!=-1 && lunarmonth_pathview.currentIndex> thangnhuan)
                      lmonth-=1;
 
                  if (thangnhuan!=-1 && lunarmonth_pathview.currentIndex> thangnhuan)
                      lmonth-=1;
 

-                var finalSolarDay = Script.convertLunar2Solar(lday,lmonth,lyear,lnhuan,7)
-
-                 LC.reset(finalSolarDay[0],finalSolarDay[1],finalSolarDay[2])
-                 Script.calculateLunar( finalSolarDay[0], finalSolarDay[1], finalSolarDay[2])
-                 Script.state="mainscreen"
-                 Script.refresh()
+                var finalSolarDay = Script.convertLunar2Solar(lday,lmonth,lyear,lnhuan,7);

 
 

-                 maindatemodel.reset()
-                 txtDATEpv.currentIndex =  finalSolarDay[0]-1;
+                 amdatetime.state="close";
+                 amdatetime.toolbar();
+                 amdatetime.updatedate(finalSolarDay[0], finalSolarDay[1], finalSolarDay[2])

 
             }
         }
 
             }
         }

diff --git a/qml/LichViet/CacNgayLeTrongNam.js b/qml/LichViet/CacNgayLeTrongNam.js
index ace1ed3..06db5ab 100644 (file)
--- a/qml/LichViet/CacNgayLeTrongNam.js
+++ b/qml/LichViet/CacNgayLeTrongNam.js
@@ -111,6 +111,7 @@ function get(curDay, curMonth,lunarDay, lunarMonth) {
         var rannum=Math.floor(Math.random()*Loi_Hay_Y_Dep.length)
         day_info =  Loi_Hay_Y_Dep[rannum];
     }
         var rannum=Math.floor(Math.random()*Loi_Hay_Y_Dep.length)
         day_info =  Loi_Hay_Y_Dep[rannum];
     }

+

     return  day_info;
 }
 
     return  day_info;
 }
 

diff --git a/qml/LichViet/DateTimeDialog.qml b/qml/LichViet/DateTimeDialog.qml
index 3ebb54f..62cbd87 100644 (file)
--- a/qml/LichViet/DateTimeDialog.qml
+++ b/qml/LichViet/DateTimeDialog.qml
@@ -34,6 +34,7 @@ Item{
     }
 
     signal toolbar
     }
 
     signal toolbar

+    signal updatedate(int day, int month, int year)

 
     Rectangle {
         id: rectangle1
 
     Rectangle {
         id: rectangle1

@@ -71,11 +72,10 @@ Item{
             text: "OK"
             visible: true
             onClicked: {
             text: "OK"
             visible: true
             onClicked: {

-                LC.reset(datePicker.mDay,datePicker.mMonth,datePicker.mYear)
-                Script.calculateLunar(datePicker.mDay,datePicker.mMonth,datePicker.mYear)
-                Script.state="mainscreen"
-                Script.refresh()
-                maindatemodel.reset()
+                datetimedlg.state="close";
+                datetimedlg.toolbar();
+                datetimedlg.updatedate(datePicker.mDay, datePicker.mMonth, datePicker.mYear)
+

                 }
         }
 
                 }
         }
 

diff --git a/qml/LichViet/FullMonth.qml b/qml/LichViet/FullMonth.qml
index a2be992..80e98b4 100644 (file)
--- a/qml/LichViet/FullMonth.qml
+++ b/qml/LichViet/FullMonth.qml
@@ -71,7 +71,7 @@ Item{
 
                 text: model.modelData
                 font.bold: true
 
                 text: model.modelData
                 font.bold: true

-                font.pointSize: width ? width / 6 : 1
+                font.pointSize: parent.width > parent.height ? width ? width / 6 : 1 : width / 4

             }
         }
     }
             }
         }
     }

@@ -97,20 +97,20 @@ Item{
             Text {
                 id:txt_solar_day
                 anchors.fill: parent
             Text {
                 id:txt_solar_day
                 anchors.fill: parent

-                anchors.leftMargin: 10
+                anchors.leftMargin: parent.width > parent.height ? 10 : 5

 
                 verticalAlignment: Text.AlignVCenter
                 horizontalAlignment: Text.AlignLeft
 
                 text: model ? model.day : ""
                 color: model ? model.inmonth ? (model.current ? "red" : model.inholiday ? theme_manager.theme.markdate.holidays : "black") : "grey" : "red"
 
                 verticalAlignment: Text.AlignVCenter
                 horizontalAlignment: Text.AlignLeft
 
                 text: model ? model.day : ""
                 color: model ? model.inmonth ? (model.current ? "red" : model.inholiday ? theme_manager.theme.markdate.holidays : "black") : "grey" : "red"

-                font.pointSize: parent.width ? parent.width / 6 : 1
+                font.pointSize: parent.width > parent.height ? parent.width ? parent.width / 6 : 1 : parent.width / 4

                 font.bold: true
             }
 
             Text {
                 anchors.fill: parent
                 font.bold: true
             }
 
             Text {
                 anchors.fill: parent

-                anchors.leftMargin: txt_solar_day.anchors.leftMargin+40
+                anchors.leftMargin: txt_solar_day.anchors.leftMargin+ parent.width > parent.height ? 60 : 35

                 anchors.topMargin: 20
 
                 verticalAlignment: Text.AlignVCenter
                 anchors.topMargin: 20
 
                 verticalAlignment: Text.AlignVCenter

@@ -118,59 +118,80 @@ Item{
 
                 text: model ? model.lunar_day : ""
                 color: model ? model.inmonth ? (model.current ? "red" : "#700070") : "grey" : "red"
 
                 text: model ? model.lunar_day : ""
                 color: model ? model.inmonth ? (model.current ? "red" : "#700070") : "grey" : "red"

-                font.pointSize: parent.width ? parent.width / 8 : 1
+                font.pointSize: parent.width > parent.height ? parent.width ? parent.width / 8 : 1 : parent.width / 5

             }
 
             MouseArea {
             }
 
             MouseArea {

+                id:memouse

                 anchors.fill: parent
 
                 property real mX
                 property real mY
                 property bool hold: false
                 anchors.fill: parent
 
                 property real mX
                 property real mY
                 property bool hold: false

+                property bool clicked: false

 
                 onClicked: {
 
                 onClicked: {

-                    /*LC.reset(model.day,m_month,m_year)
-                    screen.calculateLunar(model.day,m_month,m_year)
-                    screen.state="mainscreen"
-                    screen.refresh()
-                    maindatemodel.reset()*/
-                    fullmonth.state="close";
-                    fullmonth.toolbar();
-                    fullmonth.updatedate(model.day, m_month, m_year)
+                    if (model.inmonth){
+                        fullmonth.updatedate(model.day, m_month, m_year)
+                        hold=false;
+                        m_day = model.day;
+                        fullmonth.state="close";
+                        fullmonth.toolbar();
+
+                    }else{
+                        if (model.isprevmonth){
+                            m_month--;
+                            if(m_month<=0){
+                                m_month=12;
+                                m_year--;
+                            }
+                        }else{
+                            m_month++;
+                            if (m_month >=13){
+                                m_month=1;
+                                m_year++;
+                            }
+                        }
+                        fullmonth.reset();
+                    }

                 }
 
                 onPositionChanged: {
                     mX = mouseX;
                     mY = mouseY;
                     hold=true;
                 }
 
                 onPositionChanged: {
                     mX = mouseX;
                     mY = mouseY;
                     hold=true;

+                    clicked=false;

                 }
 
                 onPressed: {
                     recms.color="#F0F0F0"
                 }
 
                 onPressed: {
                     recms.color="#F0F0F0"

+                    clicked=true;

                 }
 
                 onReleased: {
                 }
 
                 onReleased: {

+                    recms.color=model ? model.inmonth ? (model.current ? "blue" : "lightsteelblue") : "#AAAAAA" : "black";

                     if (hold){
                         if (mouseY+mY<0){
                     if (hold){
                         if (mouseY+mY<0){

-                           if (Math.abs(mouseY) >= 30){
-                              m_month+=1;
+                           if (Math.abs(mouseY) >= 100){
+                              m_month++;

                                if (m_month >=13){
                                    m_month=1;
                                    m_year++;
                                }
                                if (m_month >=13){
                                    m_month=1;
                                    m_year++;
                                }

+                               reset();

                            }
                         }
                         else
                         {
                            }
                         }
                         else
                         {

-                           if (mouseY >= 50){
-                              m_month-=1;
+                           if (mouseY >= 100){
+                              m_month--;

                                if(m_month<=0){
                                    m_month=12;
                                    m_year--;
                                }
                                if(m_month<=0){
                                    m_month=12;
                                    m_year--;
                                }

+                               reset();

                            }
                         }
                            }
                         }

-                        reset();

                         hold=false;
                     }
                 }
                         hold=false;
                     }
                 }

@@ -296,7 +317,7 @@ Item{
         var prevmonth = get_prevmonth(startfrom)
 
         var dayclick, monthclick, yearclick;
         var prevmonth = get_prevmonth(startfrom)
 
         var dayclick, monthclick, yearclick;

-        var datas1,datas,lunarclmonth,inmonth;
+        var datas1,datas,lunarclmonth,inmonth,isprevmonth;

 
         for (var i=0;i<42;i++){
             if (i >= startfrom && j<= daysofthemonthyear){
 
         for (var i=0;i<42;i++){
             if (i >= startfrom && j<= daysofthemonthyear){

@@ -304,12 +325,17 @@ Item{
                 monthclick = m_month;
                 yearclick = m_year;
                 inmonth = true;
                 monthclick = m_month;
                 yearclick = m_year;
                 inmonth = true;

+                isprevmonth=false;

                 j++;
             }else{
                 j++;
             }else{

-                if (i<startfrom)
+                if (i<startfrom){

                     datas1=prevmonth[i];
                     datas1=prevmonth[i];

-                else
+                    isprevmonth = true;
+                }
+                else{

                     datas1=nextmonth[(totalslot-i)-1];
                     datas1=nextmonth[(totalslot-i)-1];

+                    isprevmonth = false;
+                }

 
                 dayclick = datas1.duong;
                 monthclick = datas1.month;
 
                 dayclick = datas1.duong;
                 monthclick = datas1.month;

@@ -330,7 +356,7 @@ Item{
             var stemp = Script.convertSolar2Lunar(dayclick,monthclick,yearclick,7);
             var inholiday = Script.is_holiday(dayclick, monthclick, stemp[0], stemp[1]);
 
             var stemp = Script.convertSolar2Lunar(dayclick,monthclick,yearclick,7);
             var inholiday = Script.is_holiday(dayclick, monthclick, stemp[0], stemp[1]);
 

-            monthModel.append({"day": dayclick, "current": current, "lunar_day":lunar_day, "inmonth":inmonth,"inholiday":inholiday})
+            monthModel.append({"day": dayclick, "current": current, "lunar_day":lunar_day, "inmonth":inmonth,"inholiday":inholiday,"isprevmonth":isprevmonth})

         }
 
     }
         }
 
     }

@@ -382,6 +408,6 @@ Item{
 
     transitions: Transition {
         AnchorAnimation { easing.type: Easing.OutQuart; duration: 300 }
 
     transitions: Transition {
         AnchorAnimation { easing.type: Easing.OutQuart; duration: 300 }

-    }
+       }

 
 }
 
 }

diff --git a/qml/LichViet/XemNgayTotXauHoangDao.qml b/qml/LichViet/XemNgayTotXauHoangDao.qml
index f5f4c3b..8e2f11d 100644 (file)
--- a/qml/LichViet/XemNgayTotXauHoangDao.qml
+++ b/qml/LichViet/XemNgayTotXauHoangDao.qml
@@ -68,7 +68,7 @@ Item{
                 Column {
 
                     Rectangle {
                 Column {
 
                     Rectangle {

-                                        width:rectangle1.width-10;
+                                        width:rectangle1.width;

                                         y:30;
                                         x:0
                                         height:1
                                         y:30;
                                         x:0
                                         height:1

@@ -134,7 +134,7 @@ Item{
 
         ListView {
               id: listView
 
         ListView {
               id: listView

-              anchors.fill: parent;anchors.topMargin: 45;anchors.leftMargin: 5;anchors.rightMargin: 5;anchors.bottomMargin: 55
+              anchors.fill: parent;anchors.topMargin: 45;anchors.leftMargin: 0;anchors.rightMargin: 0;anchors.bottomMargin: 55

               model: listModel
               delegate: listDelegate
               focus: true
               model: listModel
               delegate: listDelegate
               focus: true

diff --git a/qml/LichViet/main.js b/qml/LichViet/main.js
index 7813d53..49a2a24 100644 (file)
--- a/qml/LichViet/main.js
+++ b/qml/LichViet/main.js
@@ -80,6 +80,16 @@ function lunarTietKhi(){
     return TIETKHI[getSunLongitude(jd+1,7.0)];
 }
 
     return TIETKHI[getSunLongitude(jd+1,7.0)];
 }
 

+function reset_to_default_day(txtTHU, txtInfo, txtDAYAmLich){
+    localdate = new Date();
+
+    curDay=localdate.getDate();
+    curMonth=localdate.getMonth()+1;
+    curYear=localdate.getFullYear();
+
+    changeDay(curDay, txtTHU, txtInfo, txtDAYAmLich);
+}
+

 function changeDay(newday, txtTHU, txtInfo, txtDAYAmLich){
     curDay = newday;
     recalculate();
 function changeDay(newday, txtTHU, txtInfo, txtDAYAmLich){
     curDay = newday;
     recalculate();

@@ -118,7 +128,7 @@ function recalculate(){
     lunarDayCanChi = getCanChi(getLunarDate(curDay,curMonth,curYear))[0];
     lunarMonthCanChi = getCanChi(getLunarDate(curDay,curMonth,curYear))[1];
 
     lunarDayCanChi = getCanChi(getLunarDate(curDay,curMonth,curYear))[0];
     lunarMonthCanChi = getCanChi(getLunarDate(curDay,curMonth,curYear))[1];
 

-    day_info = get(curDay,curMonth, curYear, lunarDay, lunarMonth);
+    day_info = get(curDay,curMonth, lunarDay, lunarMonth);

     isholiday = is_holiday(curDay,curMonth, curYear, lunarDay, lunarMonth);
 }
 
     isholiday = is_holiday(curDay,curMonth, curYear, lunarDay, lunarMonth);
 }
 

diff --git a/qml/LichViet/main.qml b/qml/LichViet/main.qml
index d9f2d59..ae8e241 100644 (file)
--- a/qml/LichViet/main.qml
+++ b/qml/LichViet/main.qml
@@ -23,8 +23,8 @@ import "main.js" as Script
 
 Item {
      id: screen
 
 Item {
      id: screen

-     width: 800
-     height: 480
+     width: 480
+     height: 800

 
      state:"mainscreen"
 
 
      state:"mainscreen"
 

@@ -43,7 +43,9 @@ Item {
         Settings.restore_nomodel();
         Script.createDateTimeDialog(screen);
         Script.datetimedlg.toolbar.connect(show_toolbar);
         Settings.restore_nomodel();
         Script.createDateTimeDialog(screen);
         Script.datetimedlg.toolbar.connect(show_toolbar);

+        Script.datetimedlg.updatedate.connect(update_date);

         Script.amdatetimedlg.toolbar.connect(show_toolbar);
         Script.amdatetimedlg.toolbar.connect(show_toolbar);

+        Script.amdatetimedlg.updatedate.connect(update_date);

         Script.fullmonth.toolbar.connect(show_toolbar);
         Script.fullmonth.updatedate.connect(update_date);
         maindatemodel.init();
         Script.fullmonth.toolbar.connect(show_toolbar);
         Script.fullmonth.updatedate.connect(update_date);
         maindatemodel.init();

@@ -61,6 +63,10 @@ Item {
          Script.curMonth = month;
          Script.curYear = year;
          Script.changeDay(day, txtTHU, txtInfo, txtDAYAmLich);
          Script.curMonth = month;
          Script.curYear = year;
          Script.changeDay(day, txtTHU, txtInfo, txtDAYAmLich);

+         Script.fullmonth.m_day=Script.curDay;
+         Script.fullmonth.m_month=Script.curMonth;
+         Script.fullmonth.m_year=Script.curYear;
+         Script.fullmonth.reset();

      }
 
      Rectangle {
      }
 
      Rectangle {

@@ -70,10 +76,10 @@ Item {
 
          state:"jumptodate"
 
 
          state:"jumptodate"
 

-         /*Image {
+         Image {

              source: theme_manager.theme.background_image; fillMode: Image.Stretch; anchors.fill: parent
              opacity: theme_manager.theme.background_opacity
              source: theme_manager.theme.background_image; fillMode: Image.Stretch; anchors.fill: parent
              opacity: theme_manager.theme.background_opacity

-         }*/
+         }

 
 
          MouseArea {
 
 
          MouseArea {

@@ -95,8 +101,8 @@ Item {
              onDoubleClicked:{
 
                  if (Settings.doubleclicked()==1){
              onDoubleClicked:{
 
                  if (Settings.doubleclicked()==1){

-                     screen.state="datetimedialog";
-
+                     screen.state="switchX";
+                    Script.datetimedlg.state="show";

                  }
              }
          }
                  }
              }
          }

@@ -122,7 +128,24 @@ Item {
                                   text: name
                                   font.bold: true
                                   font.pixelSize: wrapper.PathView.isCurrentItem ? 80 : 40
                                   text: name
                                   font.bold: true
                                   font.pixelSize: wrapper.PathView.isCurrentItem ? 80 : 40

-                                  color: "black"
+                                  color: {
+                                      if (wrapper.PathView.isCurrentItem){
+                                          var stemp = Script.convertSolar2Lunar(txtDATEpv.currentIndex+1,curMonth,curYear,7);
+                                          if (Script.is_holiday(txtDATEpv.currentIndex+1,curMonth, stemp[0], stemp[1])){
+                                              return theme_manager.theme.markdate.holidays;
+                                          }else{
+                                          var mark_day = (Script.getLunarDate(txtDATEpv.currentIndex+1,curMonth,curYear).jd+1)%7;
+                                          if (mark_day === 0) //sunday
+                                              return theme_manager.theme.markdate.sunday;
+                                          if (mark_day == 6) //saturday
+                                              return theme_manager.theme.markdate.saturday;
+                                          else
+                                              return  theme_manager.theme.markdate.otherday_selected;
+                                          }
+                                      }
+                                      else
+                                          return "transparent";//theme_manager.theme.markdate.otherday;
+                                    }

                               }
                           }
                       }
                               }
                           }
                       }

@@ -162,6 +185,10 @@ Item {
 
                           onMovementEnded: {
                               Script.changeDay(txtDATEpv.currentIndex+1, txtTHU, txtInfo, txtDAYAmLich);
 
                           onMovementEnded: {
                               Script.changeDay(txtDATEpv.currentIndex+1, txtTHU, txtInfo, txtDAYAmLich);

+                              Script.fullmonth.m_day=Script.curDay;
+                              Script.fullmonth.m_month=Script.curMonth;
+                              Script.fullmonth.m_year=Script.curYear;
+                              Script.fullmonth.reset();

                           }
                       }
                   }
                           }
                       }
                   }

@@ -297,8 +324,17 @@ Item {
 
      function menu_item_Clicked(id){
          var qmlF = "";
 
      function menu_item_Clicked(id){
          var qmlF = "";

-         screen.state="switchX";
+         if (id!=1)
+            screen.state="switchX";

          switch(id){
          switch(id){

+            case 1: Script.reset_to_default_day(txtTHU, txtInfo, txtDAYAmLich);
+                 txtDATEpv.currentIndex = Script.curDay-1;
+                screen.curMonth = Script.curMonth;
+                screen.curYear = Script.curYear;
+                Script.fullmonth.m_day= Script.curDay-1;
+                Script.fullmonth.m_month= Script.curMonth;
+                Script.fullmonth.m_year= Script.curYear;
+                break;

             case 2: Script.amdatetimedlg.state="show";break;
             case 3: Script.datetimedlg.state="show";break;
             case 4: qmlF="XemNgayTotXauHoangDao";break;
             case 2: Script.amdatetimedlg.state="show";break;
             case 3: Script.datetimedlg.state="show";break;
             case 4: qmlF="XemNgayTotXauHoangDao";break;

@@ -333,13 +369,4 @@ Item {
          Transition { NumberAnimation { properties: "x,y,opacity"; duration: 300; easing.type: Easing.InOutBack } }
      ]
 
          Transition { NumberAnimation { properties: "x,y,opacity"; duration: 300; easing.type: Easing.InOutBack } }
      ]
 

-
-     function reset(){
-         /*calculateLunar(initcurDay, initcurMonth, initcurYear)
-         LC.reset(initcurDay, initcurMonth, initcurYear)
-         screen.state="mainscreen"
-         maindatemodel.reset()
-         txtDATEpv.currentIndex = initcurDay-1;*/
-     }
-

 }
 }

diff --git a/qml/themes/default/background.jpg b/qml/themes/default/background.jpg
index c61f523..da5eafe 100644 (file)
Binary files a/qml/themes/default/background.jpg and b/qml/themes/default/background.jpg differ

diff --git a/qml/themes/default/dp_button.png b/qml/themes/default/dp_button.png
deleted file mode 100644 (file)
index fcdc4ff..0000000
Binary files a/qml/themes/default/dp_button.png and /dev/null differ

diff --git a/qml/themes/default/dp_button_active.png b/qml/themes/default/dp_button_active.png
deleted file mode 100644 (file)
index 604d829..0000000
Binary files a/qml/themes/default/dp_button_active.png and /dev/null differ

diff --git a/qml/themes/default/dp_button_pressed.png b/qml/themes/default/dp_button_pressed.png
deleted file mode 100644 (file)
index 162b194..0000000
Binary files a/qml/themes/default/dp_button_pressed.png and /dev/null differ

diff --git a/qml/themes/default/gloss.png b/qml/themes/default/gloss.png
deleted file mode 100644 (file)
index 5d370cd..0000000
Binary files a/qml/themes/default/gloss.png and /dev/null differ

diff --git a/qml/themes/default/lineedit.png b/qml/themes/default/lineedit.png
deleted file mode 100644 (file)
index 2cc38dc..0000000
Binary files a/qml/themes/default/lineedit.png and /dev/null differ

diff --git a/qml/themes/default/lineedit.sci b/qml/themes/default/lineedit.sci
deleted file mode 100644 (file)
index 054bff7..0000000
--- a/qml/themes/default/lineedit.sci
+++ /dev/null
@@ -1,5 +0,0 @@
-border.left: 10
-border.top: 10
-border.bottom: 10
-border.right: 10
-source: lineedit.png

diff --git a/qml/themes/default/minimize.png b/qml/themes/default/minimize.png
deleted file mode 100644 (file)
index 9568fbc..0000000
Binary files a/qml/themes/default/minimize.png and /dev/null differ

diff --git a/qml/themes/default/minimize_pressed.png b/qml/themes/default/minimize_pressed.png
deleted file mode 100644 (file)
index 1856670..0000000
Binary files a/qml/themes/default/minimize_pressed.png and /dev/null differ

diff --git a/qml/themes/default/quit.png b/qml/themes/default/quit.png
deleted file mode 100644 (file)
index 69dc1b8..0000000
Binary files a/qml/themes/default/quit.png and /dev/null differ

diff --git a/qml/themes/default/quit_pressed.png b/qml/themes/default/quit_pressed.png
deleted file mode 100644 (file)
index 972ece5..0000000
Binary files a/qml/themes/default/quit_pressed.png and /dev/null differ

diff --git a/qml/themes/default/stripes.png b/qml/themes/default/stripes.png
deleted file mode 100644 (file)
index 9f36727..0000000
Binary files a/qml/themes/default/stripes.png and /dev/null differ

diff --git a/qml/themes/default/switch_off.png b/qml/themes/default/switch_off.png
deleted file mode 100644 (file)
index 3a9098c..0000000
Binary files a/qml/themes/default/switch_off.png and /dev/null differ

diff --git a/qml/themes/default/switch_on.png b/qml/themes/default/switch_on.png
deleted file mode 100644 (file)
index 666d052..0000000
Binary files a/qml/themes/default/switch_on.png and /dev/null differ

diff --git a/qml/themes/default/titlebar.png b/qml/themes/default/titlebar.png
deleted file mode 100644 (file)
index 51c9008..0000000
Binary files a/qml/themes/default/titlebar.png and /dev/null differ

diff --git a/qml/themes/default/titlebar.sci b/qml/themes/default/titlebar.sci
deleted file mode 100644 (file)
index 0418d94..0000000
--- a/qml/themes/default/titlebar.sci
+++ /dev/null
@@ -1,5 +0,0 @@
-border.left: 10
-border.top: 12
-border.bottom: 12
-border.right: 10
-source: titlebar.png

diff --git a/qml/themes/default/toolbutton-back.png b/qml/themes/default/toolbutton-back.png
deleted file mode 100644 (file)
index 1131001..0000000
Binary files a/qml/themes/default/toolbutton-back.png and /dev/null differ

diff --git a/qml/themes/default/toolbutton.png b/qml/themes/default/toolbutton.png
deleted file mode 100644 (file)
index 9ecc83b..0000000
Binary files a/qml/themes/default/toolbutton.png and /dev/null differ

diff --git a/qml/themes/default/toolbutton.sci b/qml/themes/default/toolbutton.sci
deleted file mode 100644 (file)
index 9e4f965..0000000
--- a/qml/themes/default/toolbutton.sci
+++ /dev/null
@@ -1,5 +0,0 @@
-border.left: 15
-border.top: 4
-border.bottom: 4
-border.right: 15
-source: toolbutton.png

diff --git a/qml/themes/default/toolbutton_pressed.png b/qml/themes/default/toolbutton_pressed.png
deleted file mode 100644 (file)
index 4d2969f..0000000
Binary files a/qml/themes/default/toolbutton_pressed.png and /dev/null differ

diff --git a/qml/themes/default/toolbutton_pressed.sci b/qml/themes/default/toolbutton_pressed.sci
deleted file mode 100644 (file)
index 95a4502..0000000
--- a/qml/themes/default/toolbutton_pressed.sci
+++ /dev/null
@@ -1,5 +0,0 @@
-border.left: 15
-border.top: 4
-border.bottom: 4
-border.right: 15
-source: toolbutton_pressed.png