Added page to confirm user wants to install nut

.gitignore

@@ -56,122 +56,6 @@ titledb/AU.en.json
 titledb/AT.de.json
 titledb/AR.es.json
 titledb/AR.en.json
-nut/blawar-nut-60bf4e3/titledb/ZA.en.json
-nut/blawar-nut-60bf4e3/titledb/versions.txt
-nut/blawar-nut-60bf4e3/titledb/US.es.json
-nut/blawar-nut-60bf4e3/titledb/US.en.json
-nut/blawar-nut-60bf4e3/titledb/SE.en.json
-nut/blawar-nut-60bf4e3/titledb/RU.ru.json
-nut/blawar-nut-60bf4e3/titledb/PT.pt.json
-nut/blawar-nut-60bf4e3/titledb/PL.en.json
-nut/blawar-nut-60bf4e3/titledb/PE.es.json
-nut/blawar-nut-60bf4e3/titledb/PE.en.json
-nut/blawar-nut-60bf4e3/titledb/NZ.en.json
-nut/blawar-nut-60bf4e3/titledb/NO.en.json
-nut/blawar-nut-60bf4e3/titledb/NL.nl.json
-nut/blawar-nut-60bf4e3/titledb/MX.es.json
-nut/blawar-nut-60bf4e3/titledb/MX.en.json
-nut/blawar-nut-60bf4e3/titledb/languages.json
-nut/blawar-nut-60bf4e3/titledb/KR.ko.json
-nut/blawar-nut-60bf4e3/titledb/JP.ja.json
-nut/blawar-nut-60bf4e3/titledb/IT.it.json
-nut/blawar-nut-60bf4e3/titledb/HU.en.json
-nut/blawar-nut-60bf4e3/titledb/HK.zh.json
-nut/blawar-nut-60bf4e3/titledb/GR.en.json
-nut/blawar-nut-60bf4e3/titledb/GB.en.json
-nut/blawar-nut-60bf4e3/titledb/FR.fr.json
-nut/blawar-nut-60bf4e3/titledb/FI.en.json
-nut/blawar-nut-60bf4e3/titledb/ES.es.json
-nut/blawar-nut-60bf4e3/titledb/DK.en.json
-nut/blawar-nut-60bf4e3/titledb/demos.us.txt
-nut/blawar-nut-60bf4e3/titledb/demos.jp.txt
-nut/blawar-nut-60bf4e3/titledb/demos.gb.txt
-nut/blawar-nut-60bf4e3/titledb/demos.au.txt
-nut/blawar-nut-60bf4e3/titledb/DE.de.json
-nut/blawar-nut-60bf4e3/titledb/CZ.en.json
-nut/blawar-nut-60bf4e3/titledb/CO.es.json
-nut/blawar-nut-60bf4e3/titledb/CO.en.json
-nut/blawar-nut-60bf4e3/titledb/CL.es.json
-nut/blawar-nut-60bf4e3/titledb/CL.en.json
-nut/blawar-nut-60bf4e3/titledb/CA.fr.json
-nut/blawar-nut-60bf4e3/titledb/CA.en.json
-nut/blawar-nut-60bf4e3/titledb/BE.nl.json
-nut/blawar-nut-60bf4e3/titledb/BE.fr.json
-nut/blawar-nut-60bf4e3/titledb/AU.en.json
-nut/blawar-nut-60bf4e3/titledb/AT.de.json
-nut/blawar-nut-60bf4e3/titledb/AR.es.json
-nut/blawar-nut-60bf4e3/titledb/AR.en.json
-nut/blawar-nut-60bf4e3/Ticket.tik
-nut/blawar-nut-60bf4e3/Server/Controller/Api.py
-nut/blawar-nut-60bf4e3/Server/Controller/__init__.py
-nut/blawar-nut-60bf4e3/Server/__init__.py
-nut/blawar-nut-60bf4e3/server.py
-nut/blawar-nut-60bf4e3/README.md
-nut/blawar-nut-60bf4e3/README-Pt-Br.md
-nut/blawar-nut-60bf4e3/public_html/style/reset.css
-nut/blawar-nut-60bf4e3/public_html/style/default.css
-nut/blawar-nut-60bf4e3/public_html/script/jquery-3.3.1.min.js
-nut/blawar-nut-60bf4e3/public_html/script/default.js
-nut/blawar-nut-60bf4e3/public_html/index.html
-nut/blawar-nut-60bf4e3/public_html/images/update_white.png
-nut/blawar-nut-60bf4e3/public_html/images/update.png
-nut/blawar-nut-60bf4e3/public_html/images/ss.jpg
-nut/blawar-nut-60bf4e3/public_html/images/queue.png
-nut/blawar-nut-60bf4e3/public_html/images/nutserver.png
-nut/blawar-nut-60bf4e3/public_html/images/logo.jpg
-nut/blawar-nut-60bf4e3/public_html/images/gear.png
-nut/blawar-nut-60bf4e3/public_html/images/flags/US.png
-nut/blawar-nut-60bf4e3/public_html/images/flags/TW.png
-nut/blawar-nut-60bf4e3/public_html/images/flags/KR.png
-nut/blawar-nut-60bf4e3/public_html/images/flags/JP.png
-nut/blawar-nut-60bf4e3/public_html/images/flags/HK.png
-nut/blawar-nut-60bf4e3/public_html/images/flags/GR.png
-nut/blawar-nut-60bf4e3/public_html/images/flags/GB.png
-nut/blawar-nut-60bf4e3/public_html/images/flags/FR.png
-nut/blawar-nut-60bf4e3/public_html/images/flags/EU.png
-nut/blawar-nut-60bf4e3/public_html/images/flags/ES.png
-nut/blawar-nut-60bf4e3/public_html/images/flags/DE.png
-nut/blawar-nut-60bf4e3/public_html/images/flags/CH.png
-nut/blawar-nut-60bf4e3/public_html/images/flags/AU.png
-nut/blawar-nut-60bf4e3/public_html/images/favicon.ico
-nut/blawar-nut-60bf4e3/public_html/images/download_white.png
-nut/blawar-nut-60bf4e3/public_html/images/download.png
-nut/blawar-nut-60bf4e3/public_html/images/close.png
-nut/blawar-nut-60bf4e3/nut/Users.py
-nut/blawar-nut-60bf4e3/nut/Usb.py
-nut/blawar-nut-60bf4e3/nut/Titles.py
-nut/blawar-nut-60bf4e3/nut/Title.py
-nut/blawar-nut-60bf4e3/nut/Status.py
-nut/blawar-nut-60bf4e3/nut/Print.py
-nut/blawar-nut-60bf4e3/nut/Nsps.py
-nut/blawar-nut-60bf4e3/nut/Keys.py
-nut/blawar-nut-60bf4e3/nut/Hex.py
-nut/blawar-nut-60bf4e3/nut/Config.py
-nut/blawar-nut-60bf4e3/nut/blockchain.py
-nut/blawar-nut-60bf4e3/nut/aes128.py
-nut/blawar-nut-60bf4e3/nut/__init__.py
-nut/blawar-nut-60bf4e3/nut.py
-nut/blawar-nut-60bf4e3/Fs/Xci.py
-nut/blawar-nut-60bf4e3/Fs/Type.py
-nut/blawar-nut-60bf4e3/Fs/Ticket.py
-nut/blawar-nut-60bf4e3/Fs/Rom.py
-nut/blawar-nut-60bf4e3/Fs/Pfs0.py
-nut/blawar-nut-60bf4e3/Fs/Nsp.py
-nut/blawar-nut-60bf4e3/Fs/Nca.py
-nut/blawar-nut-60bf4e3/Fs/Nacp.py
-nut/blawar-nut-60bf4e3/Fs/Ivfc.py
-nut/blawar-nut-60bf4e3/Fs/Hfs0.py
-nut/blawar-nut-60bf4e3/Fs/File.py
-nut/blawar-nut-60bf4e3/Fs/BaseFs.py
-nut/blawar-nut-60bf4e3/Fs/__init__.py
-nut/blawar-nut-60bf4e3/edge.token
-nut/blawar-nut-60bf4e3/dz/README.md
-nut/blawar-nut-60bf4e3/cron
-nut/blawar-nut-60bf4e3/conf/whitelist.txt
-nut/blawar-nut-60bf4e3/conf/users.conf
-nut/blawar-nut-60bf4e3/conf/retailOnly.blacklist
-nut/blawar-nut-60bf4e3/conf/nut.default.conf
-nut/blawar-nut-60bf4e3/conf/blacklist.txt
-nut/blawar-nut-60bf4e3/CDNSP.py
+nut/*
 conf/nut.conf
 conf/users.conf

HBUpdaterGUI.py

@@ -31,7 +31,7 @@
 import mainpage as mp
 import settingspage as sp
 import addrepopage as ar
-
+import nutpage as np
 #Main frame handler, raises and pages in z layer
 class FrameManager(tk.Tk):
 	def __init__(self, *args, **kwargs):
@@ -40,6 +40,10 @@ def __init__(self, *args, **kwargs):
 		if platform.system() == 'Windows':
 			print("Windows detected, setting icon")
 			self.iconbitmap(homebrewcore.joinpaths(homebrewcore.assetfolder, 'HBUpdater.ico'))
+		elif platform.system() == "Linux":
+			print("Linux detected, setting icon")
+			self.iconbitmap(homebrewcore.joinpaths(homebrewcore.assetfolder, 'HBUpdater.xbm'))
+
 
 		# self.resizable(False,False)
 		self.geometry("790x510")   #startup size 720p
@@ -57,7 +61,7 @@ def __init__(self, *args, **kwargs):
 
 		self.frames = {}
 		#Add frames to dict, with keyword being the name of the frame
-		for F in (mp.mainPage,ip.injectorScreen,sp.settingsPage,ar.addRepoScreen):
+		for F in (mp.mainPage,ip.injectorScreen,sp.settingsPage,ar.addRepoScreen,np.nutPage):
 			page_name = F.__name__
 			frame = F(parent=container, controller=self,back_command = lambda: self.controller.show_frame("mainPage")) 
 			self.frames[page_name] = frame

assets/HBUpdater.xbm

@@ -0,0 +1,32 @@
+#define HBUpdater_width 64
+#define HBUpdater_height 64
+static unsigned short HBUpdater_bits[] = {
+   0x8000, 0xc0ff, 0xff03, 0x0001, 0xfc00, 0x60ff, 0xff06, 0x003f, 0xfe00,
+   0x30ff, 0xff0c, 0x007f, 0x7f00, 0x18ef, 0xff18, 0x00ff, 0x8f80, 0x0cd0,
+   0xff30, 0x01ff, 0xafc0, 0x06d6, 0x5760, 0x03fd, 0x55e0, 0x03e9, 0xafc0,
+   0x07f5, 0xa9f0, 0x01ca, 0x5780, 0x0fed, 0x4a78, 0x00f5, 0xaf00, 0x1faa,
+   0x5578, 0x0065, 0xae00, 0x1faa, 0x2ab8, 0x0039, 0xbc00, 0x1ebe, 0xa538,
+   0x001a, 0xb800, 0x1fbf, 0x5abc, 0x000f, 0xf000, 0x3d7e, 0x7a7c, 0x0002,
+   0xc000, 0x3f5f, 0xfebc, 0x03ff, 0xffc0, 0x3fff, 0xfeac, 0x02c3, 0xff40,
+   0x3feb, 0xff5c, 0x02eb, 0xff40, 0x3ff7, 0xff1c, 0x02cb, 0xff40, 0x3ffa,
+   0xff6c, 0x02f3, 0xff40, 0x3ff7, 0xfe5c, 0x02c5, 0xfb40, 0x3dff, 0xfeac,
+   0x02ea, 0xaf40, 0x3b7e, 0x789c, 0x02ca, 0xd740, 0x3eaf, 0x82ac, 0x02ea,
+   0xaf40, 0x3d7f, 0xad5c, 0x02ca, 0x5740, 0x3daf, 0x52ac, 0x02f2, 0xaf40,
+   0x3ead, 0x555c, 0x02c5, 0xaf40, 0x3daa, 0xaaac, 0x02ea, 0xb740, 0x3d55,
+   0xa52c, 0x02ca, 0xab40, 0x3d5a, 0x7d5c, 0x02ea, 0x6f40, 0x3b55, 0xf95c,
+   0x02ca, 0x5740, 0x3ebf, 0x7d2c, 0x02f2, 0xaf40, 0x3d7e, 0x795c, 0x02c5,
+   0xef40, 0x3d7f, 0x97ec, 0x02ff, 0xd740, 0x3dff, 0xafdc, 0x02cf, 0xf740,
+   0x3dff, 0xa7ec, 0x02ef, 0xef40, 0x3dff, 0x97dc, 0x02cf, 0xef40, 0x3dff,
+   0xa7ec, 0x02ef, 0xd740, 0x3eff, 0x7c1c, 0x02c8, 0xd740, 0x3dbf, 0xfaac,
+   0x02ea, 0xaf40, 0x3b7f, 0xf95c, 0x02ca, 0xb740, 0x3eae, 0x7aac, 0x02e9,
+   0xaf40, 0x3d5a, 0xaaac, 0x02ca, 0xab40, 0x3db6, 0x915c, 0x02f4, 0xaf40,
+   0x3eaa, 0x569c, 0x02cf, 0xeb40, 0x3dad, 0xa8ac, 0x02ff, 0xff40, 0x3b6a,
+   0x2b5c, 0x02cf, 0xfb40, 0x3eab, 0x54ac, 0x02ff, 0xff40, 0x3ad7, 0x4abc,
+   0x02ca, 0xff40, 0x3eb5, 0x554c, 0x02e9, 0xff40, 0x3dab, 0x94bc, 0x02ca,
+   0xb740, 0x3d5a, 0x555c, 0x02e9, 0x6f40, 0x3f55, 0xaabc, 0x02ca, 0x5740,
+   0x3eab, 0x5538, 0x02f5, 0xaf40, 0x3d56, 0x24f8, 0x02c5, 0x6b40, 0x1fad,
+   0x5578, 0x02e9, 0xdf40, 0x1eaa, 0xaaf8, 0x02ca, 0x5740, 0x1fab, 0x4af0,
+   0x02f5, 0x6f40, 0x0f6d, 0x55e0, 0x02c5, 0x5740, 0x07d5, 0xaae0, 0x02ea,
+   0x6f40, 0x07f5, 0x5fc0, 0x02ca, 0x5740, 0x03f5, 0x7f80, 0x02e9, 0xaf40,
+   0x01fe, 0xfe00, 0x02ef, 0xfb40, 0x007f, 0xfc00, 0x02ff, 0xff40, 0x003f,
+   0xf000, 0xfeff, 0xff7f, 0x000f };

customwidgets.py

@@ -396,7 +396,7 @@ def __init__(self,frame,label_text,label_font=smalltext,label_color=w,text_varia
 			textvariable = text_variable,
 			)
 
-#themed author/ etc label
+
 class themedguidelabel(tk.Label):
 	def __init__(self,frame,label_text,label_font=smalltext,label_color=w,text_variable=None,anchor="w",background=light_color):
 		tk.Label.__init__(self,frame,
@@ -542,11 +542,62 @@ def __init__(self,frame):
 		themedlabel.__init__(self,frame,"")
 
 
-class thankyoubox(themedframe):
-	def __init__(self,frame,author="",thanks=""):
-		themedframe.__init__(self,frame)
-		self.author_name = columnlabel(self, author)
-		self.author_name.place(x=0,y=0,height=navbuttonheight,relwidth=1)
-		self.thanks_text = tk.Text(self,background=dark_color,foreground=lgray,borderwidth=0,highlightthickness=0,font=smallerboldtext)
-		self.thanks_text.place(relx=0,y=+(navbuttonheight + separatorwidth), relwidth=1,relheight=1)
-		self.thanks_text.insert(END,thanks)
+# class thankyoubox(themedframe):
+# 	def __init__(self,frame,author="",thanks=""):
+# 		themedframe.__init__(self,frame)
+# 		self.author_name = columnlabel(self, author)
+# 		self.author_name.place(x=0,y=0,height=navbuttonheight,relwidth=1)
+# 		self.thanks_text = tk.Text(self,background=dark_color,foreground=lgray,borderwidth=0,highlightthickness=0,font=smallerboldtext)
+# 		self.thanks_text.place(relx=0,y=+(navbuttonheight + separatorwidth), relwidth=1,relheight=1)
+# 		self.thanks_text.insert(END,thanks)
+
+# class cwlabel(tk.Label):
+# 	def __init__(self,frame,label_text,anchor="w"):
+# 		tk.Label.__init__(self,frame,
+# 			background = dark_color, 
+# 			foreground = lgray,
+# 			borderwidth = 0,
+# 			highlightthickness = 0,
+# 			font = mediumboldtext,
+# 			anchor = anchor,
+# 			text = label_text,
+# 			)
+
+class cwdevlabel(tk.Label):
+	def __init__(self,frame,label_text,anchor="w"):
+		tk.Label.__init__(self,frame,
+			background = dark_color, 
+			foreground = lgray,
+			borderwidth = 0,
+			highlightthickness = 0,
+			font = mediumboldtext,
+			anchor = anchor,
+			text = label_text,
+			)
+
+
+class cwdevtext(tk.Text):
+	def __init__(self,frame):
+		tk.Text.__init__(self,frame,
+			background=dark_color,
+			foreground=lgray,
+			borderwidth = 0,
+			highlightthickness = 0,
+			font = smalltext,
+			)
+
+class devbox(themedframe):
+	def __init__(self,frame,devname,devtext,devimage,command_name=None):
+		themedframe.__init__(self,frame,frame_borderwidth=0,frame_highlightthickness=0)
+
+		self.devimage = navbutton(self,image_object=devimage,command_name=command_name)
+		self.devimage.place(x=0,y=0,width=2*navbuttonheight,height=2*navbuttonheight)
+
+		self.devname = cwdevlabel(self,devname)
+		self.devname.place(x=2*navbuttonheight+separatorwidth,y=0,relwidth=1)
+
+		self.devtext = cwdevtext(self)
+		self.devtext.place(x=2*navbuttonheight+separatorwidth,y=0.5*navbuttonheight+separatorwidth,relwidth=1,width=-(2*navbuttonheight+separatorwidth))
+		self.devtext.insert(END,devtext)
+
+

locations.py

@@ -1,39 +1,18 @@
-#locations.py
+developers = {
+	"LyfeOnEdge" : {
+		"gravatar_url" : "http://de.gravatar.com/lyfeonedge.json",
+		"project_page_url" : "https://discord.gg/cXtmY9M",
+		"dev_flavor_text" : "In Soviet Russia, switch hack you.\nColorblind.\n←Join my discord for dragons"
+	},
 
-	# {
-	#	"software" : "",
-	# 	"githubapi" : "",
-	# 	"github_asset" : None, #(none defaults to 0)
-	# 	
-
-	#	"author" : None, 		#(None will populate from github)
-	#	"projectpage": None,
-	# 	"description" : "",
-	# 	"group" : ,
-
-	# 	"install_subfolder": None,
-	# 	"content_type"
-	# 	"zip_items": None,
-	# }
-
-	#Template
-	# {
-	# "software" : "",
-	# "githubapi" : "",
-	# "github_asset" : None, 
-	# 
+	"pprmint" : {
+		"gravatar_url" : "http://de.gravatar.com/npprmint.json",
+		"project_page_url" : "npprmint.github.io",
+		"dev_flavor_text" : "UI concept and asset designer.\n\n←Click here to visit his website"
+	}
 
-	# "author" : None, 
-	# "projectpage": None,
-	# "description" : "",
-	# "group" : ,
+}
 
-	# "install_subfolder": None,
-	# 
-	# "zip_items": None,
-	# },
-#.zip application/x-zip-compressed
-#.bin application/octet-stream
 GAME = "game"
 TOOL = "tool"
 RECCOMENDED = "recomended"
@@ -631,4 +610,6 @@
 		"flask", 
 		"pyqt5"
 		]
-	}
+	}
+
+