Compare commits

..

2 Commits

Author SHA1 Message Date
a3ca04ddc5 更新到spark,加入apt-list的修改功能 2020-07-04 12:09:35 +08:00
147258a7ac SparkProject 2020-07-03 20:53:58 +08:00
8 changed files with 748 additions and 613 deletions

View File

@@ -1,7 +1,7 @@
# 深度社区应用商店 # 星火商店
#### 介绍 #### 介绍
deepin社区商店由社区维护 星火商店商店,由深度社区爱好者维护
web页面部分正在开发当中详情请见[web仓库](https://gitee.com/deepin-community-store/DCSAPP_WEB) web页面部分正在开发当中详情请见[web仓库](https://gitee.com/deepin-community-store/DCSAPP_WEB)
#### 说明 #### 说明

View File

@@ -7,15 +7,14 @@ int main(int argc, char *argv[])
{ {
DApplication::loadDXcbPlugin(); //让bar处在标题栏中 DApplication::loadDXcbPlugin(); //让bar处在标题栏中
DApplication a(argc, argv); DApplication a(argc, argv);
a.setAttribute(Qt::AA_UseHighDpiPixmaps); a.setAttribute(Qt::AA_UseHighDpiPixmaps);
a.loadTranslator(); a.loadTranslator();
a.setOrganizationName("deepin"); a.setOrganizationName("community");
a.setApplicationVersion(DApplication::buildVersion("1.0-beta3")); a.setApplicationVersion(DApplication::buildVersion("1.0-beta3.2"));
a.setApplicationAcknowledgementPage("https://gitee.com/deepin-community-store/deepin-community-store"); a.setApplicationAcknowledgementPage("https://gitee.com/deepin-community-store/deepin-community-store");
a.setProductIcon(QIcon::fromTheme("deepin-community-store")); //设置Logo a.setProductIcon(QIcon::fromTheme("spark-store")); //设置Logo
a.setProductName("深度社区应用商店"); a.setProductName("星火应用商店");
a.setApplicationName("社区应用商店"); //只有在这儿修改窗口标题才有效 a.setApplicationName("星火应用商店"); //只有在这儿修改窗口标题才有效
MainWindow w; MainWindow w;
w.show(); w.show();

View File

@@ -12,6 +12,9 @@ MainWindow::MainWindow(QWidget *parent)
resize(w->size()); //设置窗口大小 resize(w->size()); //设置窗口大小
setMinimumSize(950,700); setMinimumSize(950,700);
setCentralWidget(w); setCentralWidget(w);
// searchEdit->setParent(this);
// searchEdit->move(1,1);
// searchEdit->show();
} }
MainWindow::~MainWindow() MainWindow::~MainWindow()

View File

@@ -4,6 +4,7 @@
#include <DMainWindow> #include <DMainWindow>
#include "widget.h" #include "widget.h"
#include <QThread> #include <QThread>
#include <DSearchEdit>
DWIDGET_USE_NAMESPACE DWIDGET_USE_NAMESPACE
class MainWindow : public DMainWindow class MainWindow : public DMainWindow
@@ -14,7 +15,7 @@ class MainWindow : public DMainWindow
public: public:
MainWindow(QWidget *parent = nullptr); MainWindow(QWidget *parent = nullptr);
~MainWindow(); ~MainWindow();
// DSearchEdit *searchEdit=new DSearchEdit;
private: private:
Widget *w; Widget *w;

View File

@@ -8,7 +8,7 @@ QT += core gui webkitwidgets network concurrent
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
TARGET = deepin-community-store TARGET = spark-store
TEMPLATE = app TEMPLATE = app
# The following define makes your compiler emit warnings if you use # The following define makes your compiler emit warnings if you use

View File

@@ -70,6 +70,7 @@ Widget::Widget(QWidget *parent) :
configCanSeve=true; configCanSeve=true;
qDebug()<<serverUrl; qDebug()<<serverUrl;
menuUrl[0]=serverUrl + "store/#/"; menuUrl[0]=serverUrl + "store/#/";
// menuUrl[0]="http://127.0.0.1:8000/#/relations";
menuUrl[1]=serverUrl + "store/#/network/"; menuUrl[1]=serverUrl + "store/#/network/";
menuUrl[2]=serverUrl + "store/#/relations"; menuUrl[2]=serverUrl + "store/#/relations";
menuUrl[3]=serverUrl + "store/#/musicandsound"; menuUrl[3]=serverUrl + "store/#/musicandsound";
@@ -117,7 +118,14 @@ Widget::Widget(QWidget *parent) :
} }
}); });
chooseLeftMenu(0); chooseLeftMenu(0);
QFile aptserver("/etc/apt/sources.list.d/sparkstore.list");
aptserver.open(QIODevice::ReadOnly);
if(aptserver.isOpen()){
ui->label_aptserver->setText(aptserver.readAll());
}else {
ui->label_aptserver->setText("不存在");
}
aptserver.close();
} }
@@ -516,3 +524,47 @@ void Widget::on_pushButton_3_clicked()
ui->comboBox_server->setCurrentIndex(0); ui->comboBox_server->setCurrentIndex(0);
}); });
} }
void Widget::on_pushButton_4_clicked()
{
QtConcurrent::run([=](){
ui->pushButton_4->setEnabled(false);
ui->label_aptserver->setText("请稍等,正在更新");
std::fstream sourcesList;
system("mkdir /tmp/spark-store");
sourcesList.open("/tmp/spark-store/sparkstore.list",std::ios::out);
if(sourcesList){
sourcesList<<"deb [by-hash=force] ";
sourcesList<<QString::fromUtf8(ui->comboBox_server->currentText().toUtf8()).toStdString();
sourcesList<<" ./";
std::fstream update;
update.open("/tmp/spark-store/update.sh",std::ios::out);
update<<"#!/bin/sh\n";
update<<"mv /tmp/spark-store/sparkstore.list /etc/apt/sources.list.d/sparkstore.list && apt update";
update.close();
system("chmod +x /tmp/spark-store/update.sh");
QProcess runupdate;
runupdate.start("pkexec /tmp/spark-store/update.sh");
runupdate.waitForFinished();
qDebug()<<runupdate.readAllStandardError();
QString error=QString::fromStdString(runupdate.readAllStandardError().toStdString());
QStringList everyError=error.split("\n");
bool haveError=false;
for (int i=0;i<everyError.size();i++) {
qDebug()<<everyError[i].left(2);
if(everyError[i].left(2)=="E:"){
haveError=true;
}
}
if(!haveError){
ui->label_aptserver->setText("deb [by-hash=force] "+ui->comboBox_server->currentText().toUtf8()+" ./");
}else {
ui->label_aptserver->setText("更新中发生错误请在终端使用apt update来查看错误原因");
}
}else {
qDebug()<<"更新源失败";
}
ui->pushButton_4->setEnabled(true);
});
}

View File

@@ -85,6 +85,8 @@ private slots:
void on_pushButton_3_clicked(); void on_pushButton_3_clicked();
void on_pushButton_4_clicked();
public: public:
QUrl url; QUrl url;
bool isBusy=false; bool isBusy=false;

1282
widget.ui

File diff suppressed because it is too large Load Diff